- use popt autohelp for rpm helper binaries.

CVS patchset: 4396
CVS date: 2001/01/01 23:14:47

74 files changed, 15066 insertions, 11907 deletions

diff --git a/CHANGES b/CHANGES
index dc79e8bf3..f41481a18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -88,6 +88,7 @@
 	- (popt): non-linux needs <float.h> (#22732).
 	- (popt): add POPT_ARGFLAG_OPTIONAL for long options with optional arg.
 	- (popt): diddle auto-help to include type of arg expected.
+	- use popt autohelp for rpm helper binaries.
 
 3.0.6 -> 4.0
 	- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.
diff --git a/build.c b/build.c
index 6f6dbc13f..860a9fd86 100644
--- a/build.c
+++ b/build.c
@@ -87,12 +87,10 @@ static int isSpecFile(const char *specfile)
 }
 
 static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
-	const char *passPhrase, int fromTarball, char *cookie,
-	int force, int nodeps)
+	const char *passPhrase, char *cookie)
 {
     int buildAmount = ba->buildAmount;
     const char *buildRootURL = NULL;
-    int test = ba->noBuild;
     const char * specFile;
     const char * specURL;
     int specut;
@@ -107,7 +105,7 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
     if (ba->buildRootOverride)
 	buildRootURL = rpmGenPath(NULL, ba->buildRootOverride, NULL);
 
-    if (fromTarball) {
+    if (ba->buildMode == 't') {
 	FILE *fp;
 	const char *specDir;
 	const char * tmpSpecFile;
@@ -237,7 +235,7 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
 #define	_anyarch(_f)	\
 (((_f)&(RPMBUILD_PREP|RPMBUILD_BUILD|RPMBUILD_INSTALL|RPMBUILD_PACKAGEBINARY)) == 0)
     if (parseSpec(&spec, specURL, ba->rootdir, buildRootURL, 0, passPhrase,
-		cookie, _anyarch(buildAmount), force)) {
+		cookie, _anyarch(buildAmount), ba->force)) {
 	rc = 1;
 	goto exit;
     }
@@ -247,17 +245,17 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
     initSourceHeader(spec);
 
     /* Check build prerequisites */
-    if (!nodeps && checkSpec(spec->sourceHeader)) {
+    if (!ba->noDeps && checkSpec(spec->sourceHeader)) {
 	rc = 1;
 	goto exit;
     }
 
-    if (buildSpec(spec, buildAmount, test)) {
+    if (buildSpec(spec, buildAmount, ba->noBuild)) {
 	rc = 1;
 	goto exit;
     }
     
-    if (fromTarball) Unlink(specURL);
+    if (ba->buildMode == 't') Unlink(specURL);
     rc = 0;
 
 exit:
@@ -269,8 +267,7 @@ exit:
 }
 
 int build(const char * arg, struct rpmBuildArguments * ba,
-	const char * passPhrase, int fromTarball, char * cookie,
-	const char * rcfile, int force, int nodeps)
+	const char * passPhrase, char * cookie, const char * rcfile)
 {
     char *t, *te;
     int rc = 0;
@@ -279,8 +276,7 @@ int build(const char * arg, struct rpmBuildArguments * ba,
     int cleanFlags = ba->buildAmount & buildCleanMask;
 
     if (targets == NULL) {
-	rc =  buildForTarget(arg, ba, passPhrase, fromTarball, cookie,
-		force, nodeps);
+	rc =  buildForTarget(arg, ba, passPhrase, cookie);
 	goto exit;
     }
 
@@ -306,8 +302,7 @@ int build(const char * arg, struct rpmBuildArguments * ba,
 	/* Read in configuration for target. */
 	rpmFreeMacros(NULL);
 	rpmReadConfigFiles(rcfile, target);
-	rc = buildForTarget(arg, ba, passPhrase, fromTarball, cookie,
-		force, nodeps);
+	rc = buildForTarget(arg, ba, passPhrase, cookie);
 	if (rc)
 	    break;
     }
diff --git a/build.h b/build.h
index 61370ab10..e98ed85b8 100644
--- a/build.h
+++ b/build.h
@@ -6,8 +6,7 @@ extern "C" {
 #endif
 
 int build(const char *arg, struct rpmBuildArguments *ba, const char *passPhrase,
-	  int fromTarball, char *cookie, const char * rcfile, int force,
-	  int nodeps);
+	  char *cookie, const char * rcfile);
 
 #ifdef __cplusplus
 }
diff --git a/lib/poptBT.c b/lib/poptBT.c
index 6928c9894..48ea69754 100644
--- a/lib/poptBT.c
+++ b/lib/poptBT.c
@@ -22,6 +22,9 @@ struct rpmBuildArguments         rpmBTArgs;
 #define	POPT_NOBUILD		1008
 #define	POPT_SHORTCIRCUIT	1009
 #define	POPT_RMSPEC		1010
+#define	POPT_NODEPS		1011
+#define	POPT_SIGN		1012
+#define	POPT_FORCE		1013
 
 #define	POPT_REBUILD		0x4220
 #define	POPT_RECOMPILE		0x4320
@@ -40,16 +43,21 @@ struct rpmBuildArguments         rpmBTArgs;
 #define	POPT_TP			0x7470
 #define	POPT_TS			0x7473
 
+extern int _noDirTokens;
+static int force = 0;
 int noLang = 0;
 static int noBuild = 0;
+static int noDeps = 0;
+static int signIt = 0;
 static int useCatalog = 0;
 
 static void buildArgCallback( /*@unused@*/ poptContext con,
 	/*@unused@*/ enum poptCallbackReason reason,
 	const struct poptOption * opt, const char * arg, const void * data)
 {
-    struct rpmBuildArguments * rba = (struct rpmBuildArguments *) data;
+    struct rpmBuildArguments * rba = &rpmBTArgs;
 
+fprintf(stderr, "*** buildArgCallback\n");
     switch (opt->val) {
     case POPT_REBUILD:
     case POPT_RECOMPILE:
@@ -72,10 +80,13 @@ static void buildArgCallback( /*@unused@*/ poptContext con,
 	    rba->buildChar = (opt->val     ) & 0xff;
 	}
 	break;
-    case POPT_USECATALOG: rba->useCatalog = 1; break;
+    case POPT_FORCE: rba->force = 1; break;
     case POPT_NOBUILD: rba->noBuild = 1; break;
+    case POPT_NODEPS: rba->noDeps = 1; break;
     case POPT_NOLANG: rba->noLang = 1; break;
     case POPT_SHORTCIRCUIT: rba->shortCircuit = 1; break;
+    case POPT_SIGN: rba->sign = 1; break;
+    case POPT_USECATALOG: rba->useCatalog = 1; break;
     case POPT_RMSOURCE: rba->buildAmount |= RPMBUILD_RMSOURCE; break;
     case POPT_RMSPEC: rba->buildAmount |= RPMBUILD_RMSPEC; break;
     case POPT_RMBUILD: rba->buildAmount |= RPMBUILD_RMBUILD; break;
@@ -103,61 +114,89 @@ static void buildArgCallback( /*@unused@*/ poptContext con,
 
 /** */
 struct poptOption rpmBuildPoptTable[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
-		buildArgCallback, 0, NULL, NULL },
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
+	buildArgCallback, 0, NULL, NULL },
+
+ { "bp", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BP,
+	N_("build through %prep (unpack sources and apply patches) from <specfile>"),
+	N_("<specfile>") },
+ { "bc", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BC,
+	N_("build through %build (%prep, then compile) from <specfile>"),
+	N_("<specfile>") },
+ { "bi", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BI,
+	N_("build through %install (%prep, %build, then install) from <specfile>"),
+	N_("<specfile>") },
+ { "bl", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BL,
+	N_("verify %files section from <specfile>"),
+	N_("<specfile>") },
+ { "ba", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BA,
+	N_("build source and binary packages from <specfile>"),
+	N_("<specfile>") },
+ { "bb", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BB,
+	N_("build binary package only from <specfile>"),
+	N_("<specfile>") },
+ { "bs", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BS,
+	N_("build source package only from <specfile>"),
+	N_("<specfile>") },
 
-	{ "bp", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BP,
-		N_("build through %%prep stage from spec file"), NULL},
-	{ "bc", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BC,
-		N_("build through %%build stage from spec file"), NULL},
-	{ "bi", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BI,
-		N_("build through %%install stage from spec file"), NULL},
-	{ "bl", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BL,
-		N_("verify %%files section from spec file"), NULL},
-	{ "ba", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BA,
-		N_("build source and binary package from spec file"), NULL},
-	{ "bb", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BB,
-		N_("build binary package from spec file"), NULL},
-	{ "bs", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BS,
-		N_("build source package from spec file"), NULL},
+ { "tp", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TP,
+	N_("build through %prep (unpack sources and apply patches) from <tarball>"),
+	N_("<tarball>") },
+ { "tc", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TC,
+	N_("build through %build (%prep, then compile) from <tarball>"),
+	N_("<tarball>") },
+ { "ti", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TI,
+	N_("build through %install (%prep, %build, then install) from <tarball>"),
+	N_("<tarball>") },
+ { "tl", 0, POPT_ARGFLAG_ONEDASH|POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_TL,
+	N_("verify %files section from <tarball>"),
+	N_("<tarball>") },
+ { "ta", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TA,
+	N_("build source and binary packages from <tarball>"),
+	N_("<tarball>") },
+ { "tb", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TB,
+	N_("build binary package only from <tarball>"),
+	N_("<tarball>") },
+ { "ts", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TS,
+	N_("build source package only from <tarball>"),
+	N_("<tarball>") },
 
-	{ "tp", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TP,
-		N_("build through %%prep stage from tar ball"), NULL},
-	{ "tc", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TC,
-		N_("build through %%build stage from tar ball"), NULL},
-	{ "ti", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TI,
-		N_("build through %%install stage from tar ball"), NULL},
-	{ "tl", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TL,
-		N_("verify %%files section from tar ball"), NULL},
-	{ "ta", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TA,
-		N_("build source and binary package from tar ball"), NULL},
-	{ "tb", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TB,
-		N_("build binary package from tar ball"), NULL},
-	{ "ts", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_TS,
-		N_("build source package from tar ball"), NULL},
+ { "rebuild", '\0', 0, 0, POPT_REBUILD,
+	N_("build binary package from <source package>"),
+	N_("<source package>") },
+ { "recompile", '\0', 0, 0, POPT_REBUILD,
+	N_("build through %install (%prep, %build, then install) from <source package>"),
+	N_("<source package>") },
 
-	{ "rebuild", '\0', 0, 0, POPT_REBUILD,
-		N_("build binary package from source package"), NULL},
-	{ "recompile", '\0', 0, 0, POPT_REBUILD,
-		N_("build through %%install stage from source package"), NULL},
+ { "buildroot", '\0', POPT_ARG_STRING, 0,  POPT_BUILDROOT,
+	N_("override build root"), "DIRECTORY" },
+ { "clean", '\0', 0, 0, POPT_RMBUILD,
+	N_("remove build tree when done"), NULL},
+ { "dirtokens", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_noDirTokens, 0,
+	N_("generate headers compatible with rpm4 packaging"), NULL},
+ { "force", '\0', POPT_ARGFLAG_DOC_HIDDEN, &force, POPT_FORCE,
+        N_("ignore ExcludeArch: directives from spec file"), NULL},
+ { "nobuild", '\0', 0, &noBuild,  POPT_NOBUILD,
+	N_("do not execute any stages of the build"), NULL },
+ { "nodeps", '\0', 0, &noDeps, POPT_NODEPS,
+	N_("do not verify package dependencies"), NULL },
+ { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,
+	N_("generate package header(s) compatible with (legacy) rpm[23] packaging"),
+	NULL},
+ { "nolang", '\0', POPT_ARGFLAG_DOC_HIDDEN, &noLang, POPT_NOLANG,
+	N_("do not accept i18N msgstr's from specfile"), NULL},
+ { "rmsource", '\0', 0, 0, POPT_RMSOURCE,
+	N_("remove sources when done"), NULL},
+ { "rmspec", '\0', 0, 0, POPT_RMSPEC,
+	N_("remove specfile when done"), NULL},
+ { "short-circuit", '\0', 0, 0,  POPT_SHORTCIRCUIT,
+	N_("skip straight to specified stage (only for c,i)"), NULL },
+ { "sign", '\0', POPT_ARGFLAG_DOC_HIDDEN, &signIt, POPT_SIGN,
+	N_("generate PGP/GPG signature"), NULL },
+ { "target", '\0', POPT_ARG_STRING, 0,  POPT_TARGETPLATFORM,
+	N_("override target platform"), "CPU-VENDOR-OS" },
+ { "usecatalog", '\0', POPT_ARGFLAG_DOC_HIDDEN, &useCatalog, POPT_USECATALOG,
+	N_("lookup i18N strings in specfile catalog"), NULL},
 
-	{ "buildroot", '\0', POPT_ARG_STRING, 0,  POPT_BUILDROOT,
-		N_("override build root"), "DIRECTORY" },
-	{ "clean", '\0', 0, 0, POPT_RMBUILD,
-		N_("remove build tree when done"), NULL},
-	{ "nobuild", '\0', 0, &noBuild,  POPT_NOBUILD,
-		N_("do not execute any stages of the build"), NULL },
-	{ "nolang", '\0', 0, &noLang, POPT_NOLANG,
-		N_("do not accept I18N msgstr's from specfile"), NULL},
-	{ "rmsource", '\0', 0, 0, POPT_RMSOURCE,
-		N_("remove sources when done"), NULL},
-	{ "rmspec", '\0', 0, 0, POPT_RMSPEC,
-		N_("remove specfile when done"), NULL},
-	{ "short-circuit", '\0', 0, 0,  POPT_SHORTCIRCUIT,
-		N_("skip straight to specified stage (only for c,i)"), NULL },
-	{ "target", '\0', POPT_ARG_STRING, 0,  POPT_TARGETPLATFORM,
-		N_("override target platform"), "CPU-VENDOR-OS" },
-	{ "usecatalog", '\0', 0, &useCatalog, POPT_USECATALOG,
-		N_("lookup I18N strings in specfile catalog"), NULL},
-	{ 0, 0, 0, 0, 0,	NULL, NULL }
+   POPT_TABLEEND
 };
diff --git a/lib/poptQV.c b/lib/poptQV.c
index e37219a73..786e48e3b 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -27,7 +27,7 @@ static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con,
 	const struct poptOption * opt, /*@unused@*/ const char * arg, 
 	const void * data)
 {
-    QVA_t *qva = (QVA_t *) data;
+    QVA_t *qva = &rpmQVArgs;
 
     switch (opt->val) {
     case 'q':
@@ -62,35 +62,35 @@ static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con,
 }
 
 struct poptOption rpmQVSourcePoptTable[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
-		rpmQVSourceArgCallback, 0, NULL, NULL },
-	{ "all", 'a', 0, 0, 'a',
-		N_("query/verify all packages"), NULL },
-	{ "file", 'f', 0, 0, 'f',
-		N_("query/verify package owning file"), "FILE" },
-	{ "group", 'g', 0, 0, 'g',
-		N_("query/verify packages in group"), "GROUP" },
-	{ "package", 'p', 0, 0, 'p',
-		N_("query/verify a package file"), NULL },
-	{ "query", 'q', 0, NULL, 'q',
-		N_("rpm query mode"), NULL },
-	{ "querybynumber", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, 
-		POPT_QUERYBYNUMBER, NULL, NULL },
-	{ "querytags", '\0', 0, 0, 'Q',
-		N_("display known query tags"), NULL },
-	{ "specfile", '\0', 0, 0, POPT_SPECFILE,
-		N_("query a spec file"), NULL },
-	{ "triggeredby", '\0', 0, 0, POPT_TRIGGEREDBY, 
-		N_("query the pacakges triggered by the package"), "PACKAGE" },
-	{ "verify", 'V', 0, NULL, 'V',
-		N_("rpm verify mode"), NULL },
-	{ NULL, 'y',  POPT_ARGFLAG_DOC_HIDDEN, NULL, 'V',
-		N_("rpm verify mode (legacy)"), NULL },
-	{ "whatrequires", '\0', 0, 0, POPT_WHATREQUIRES, 
-		N_("query the packages which require a capability"), "CAPABILITY" },
-	{ "whatprovides", '\0', 0, 0, POPT_WHATPROVIDES, 
-		N_("query the packages which provide a capability"), "CAPABILITY" },
-	{ 0, 0, 0, 0, 0,	NULL, NULL }
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
+	rpmQVSourceArgCallback, 0, NULL, NULL },
+ { "all", 'a', 0, 0, 'a',
+	N_("query/verify all packages"), NULL },
+ { "file", 'f', 0, 0, 'f',
+	N_("query/verify package(s) owning file"), "FILE" },
+ { "group", 'g', 0, 0, 'g',
+	N_("query/verify package(s) in group"), "GROUP" },
+ { "package", 'p', 0, 0, 'p',
+	N_("query/verify a package file (i.e. a binary *.rpm file)"), NULL },
+ { "query", 'q', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'q',
+	N_("rpm query mode"), NULL },
+ { "querybynumber", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, 
+	POPT_QUERYBYNUMBER, NULL, NULL },
+ { "querytags", '\0', 0, 0, 'Q',
+	N_("display known query tags"), NULL },
+ { "specfile", '\0', 0, 0, POPT_SPECFILE,
+	N_("query a spec file"), N_("<spec>") },
+ { "triggeredby", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_TRIGGEREDBY, 
+	N_("query the package(s) triggered by the package"), "PACKAGE" },
+ { "verify", 'V', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'V',
+	N_("rpm verify mode"), NULL },
+ { NULL, 'y',  POPT_ARGFLAG_DOC_HIDDEN, NULL, 'V',
+	N_("rpm verify mode (legacy)"), NULL },
+ { "whatrequires", '\0', 0, 0, POPT_WHATREQUIRES, 
+	N_("query/verify the package(s) which require a dependency"), "CAPABILITY" },
+ { "whatprovides", '\0', 0, 0, POPT_WHATPROVIDES, 
+	N_("query/verify the package(s) which provide a dependency"), "CAPABILITY" },
+   POPT_TABLEEND
 };
 
 /* ========== Query specific popt args */
@@ -99,7 +99,7 @@ static void queryArgCallback(/*@unused@*/poptContext con, /*@unused@*/enum poptC
 			     const struct poptOption * opt, const char * arg, 
 			     const void * data)
 {
-    QVA_t *qva = (QVA_t *) data;
+    QVA_t *qva = &rpmQVArgs;
 
     switch (opt->val) {
     case 'c': qva->qva_flags |= QUERY_FOR_CONFIG | QUERY_FOR_LIST; break;
@@ -126,27 +126,29 @@ static void queryArgCallback(/*@unused@*/poptContext con, /*@unused@*/enum poptC
 }
 
 struct poptOption rpmQueryPoptTable[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
-		queryArgCallback, 0, NULL, NULL },
-	{ "configfiles", 'c', 0, 0, 'c',
-		N_("list all configuration files"), NULL },
-	{ "docfiles", 'd', 0, 0, 'd',
-		N_("list all documentation files"), NULL },
-	{ "dump", '\0', 0, 0, POPT_DUMP,
-		N_("dump basic file information"), NULL },
-	{ "list", 'l', 0, 0, 'l',
-		N_("list files in package"), NULL },
-	{ "qf", '\0', POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, 0, 
-		POPT_QUERYFORMAT, NULL, NULL },
-	{ "queryformat", '\0', POPT_ARG_STRING, 0, POPT_QUERYFORMAT,
-		N_("use the following query format"), "QUERYFORMAT" },
-	{ "specedit", '\0', POPT_ARG_VAL, &specedit, -1,
-		N_("substitute i18n sections into spec file"), NULL },
-	{ "state", 's', 0, 0, 's',
-		N_("display the states of the listed files"), NULL },
-	{ "verbose", 'v', 0, 0, 'v',
-		N_("display a verbose file listing"), NULL },
-	{ 0, 0, 0, 0, 0,	NULL, NULL }
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
+	queryArgCallback, 0, NULL, NULL },
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
+	NULL, NULL },
+ { "configfiles", 'c', 0, 0, 'c',
+	N_("list all configuration files"), NULL },
+ { "docfiles", 'd', 0, 0, 'd',
+	N_("list all documentation files"), NULL },
+ { "dump", '\0', 0, 0, POPT_DUMP,
+	N_("dump basic file information"), NULL },
+ { "list", 'l', 0, 0, 'l',
+	N_("list files in package"), NULL },
+ { "qf", '\0', POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, 0, 
+	POPT_QUERYFORMAT, NULL, NULL },
+ { "queryformat", '\0', POPT_ARG_STRING, 0, POPT_QUERYFORMAT,
+	N_("use the following query format"), "QUERYFORMAT" },
+ { "specedit", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &specedit, -1,
+	N_("substitute i18n sections into spec file"), NULL },
+ { "state", 's', 0, 0, 's',
+	N_("display the states of the listed files"), NULL },
+ { "verbose", 'v', 0, 0, 'v',
+	N_("display a verbose file listing"), NULL },
+   POPT_TABLEEND
 };
 
 /* ======================================================================== */
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 7b01eca2d..77897554d 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -393,8 +393,6 @@ typedef	enum rpmsenseFlags_e {
 #define	isInstallPreReq(_x)	((_x) & _INSTALL_ONLY_MASK)
 #define	isErasePreReq(_x)	((_x) & _ERASE_ONLY_MASK)
 
-#define	xfree(_p)	free((void *)_p)
-
 /* ==================================================================== */
 /** \name RPMRC */
 /*@{*/
@@ -1132,10 +1130,13 @@ struct rpmBuildArguments {
     int buildAmount;		/*!< Bit(s) to control operation. */
     const char *buildRootOverride; /*!< from --buildroot */
     char *targets;		/*!< Target platform(s), comma separated. */
-    int useCatalog;		/*!< from --usecatalog */
-    int noLang;			/*!< from --nolang */
+    int force;			/*!< from --force */
     int noBuild;		/*!< from --nobuild */
+    int noDeps;			/*!< from --nodeps */
+    int noLang;			/*!< from --nolang */
     int shortCircuit;		/*!< from --short-circuit */
+    int sign;			/*!< from --sign */
+    int useCatalog;		/*!< from --usecatalog */
     char buildMode;		/*!< Build mode (one of "btBC") */
     char buildChar;		/*!< Build stage (one of "abcilps ") */
 /*@dependent@*/ const char *rootdir;
diff --git a/lib/verify.c b/lib/verify.c
index eeb9da28c..bd0e4b261 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -21,7 +21,10 @@ static union _vendian { int i; char b[4]; } *_endian = (union _vendian *)&_ie;
 
 #define S_ISDEV(m) (S_ISBLK((m)) || S_ISCHR((m)))
 
-#define	POPT_NOFILES	1000
+#define	POPT_NODEPS	1000
+#define	POPT_NOFILES	1001
+#define	POPT_NOMD5	1002
+#define	POPT_NOSCRIPTS	1003
 
 /* ========== Verify specific popt args */
 static void verifyArgCallback(/*@unused@*/poptContext con,
@@ -29,20 +32,39 @@ static void verifyArgCallback(/*@unused@*/poptContext con,
 	const struct poptOption * opt, /*@unused@*/const char * arg,
 	const void * data)
 {
-    QVA_t *qva = (QVA_t *) data;
+    QVA_t *qva = &rpmQVArgs;
     switch (opt->val) {
-      case POPT_NOFILES: qva->qva_flags |= VERIFY_FILES; break;
+    case POPT_NODEPS: qva->qva_flags |= VERIFY_DEPS; break;
+    case POPT_NOFILES: qva->qva_flags |= VERIFY_FILES; break;
+    case POPT_NOMD5: qva->qva_flags |= VERIFY_MD5; break;
+    case POPT_NOSCRIPTS: qva->qva_flags |= VERIFY_SCRIPT; break;
     }
 }
 
+static int noDeps = 0;
 static int noFiles = 0;
+static int noMd5 = 0;
+static int noScripts = 0;
+
 /** */
 struct poptOption rpmVerifyPoptTable[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
-		verifyArgCallback, 0, NULL, NULL },
- 	{ "nofiles", '\0', 0, &noFiles, POPT_NOFILES,
-		N_("don't verify files in package"), NULL},
-	{ 0, 0, 0, 0, 0,	NULL, NULL }
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
+	verifyArgCallback, 0, NULL, NULL },
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
+	NULL, NULL },
+ { "nodeps", '\0', 0, &noDeps, POPT_NODEPS,
+	N_("do not verify package dependencies"),
+	NULL },
+ { "nofiles", '\0', 0, &noFiles, POPT_NOFILES,
+	N_("don't verify files in package"),
+	NULL},
+ { "nomd5", '\0', 0, &noMd5, POPT_NOMD5,
+	N_("do not verify file md5 checksums"),
+	NULL },
+ { "noscripts", '\0', 0, &noScripts, POPT_NOSCRIPTS,
+        N_("do not execute %verifyscript (if any)"),
+        NULL },
+    POPT_TABLEEND
 };
 
 /* ======================================================================== */
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index bb66f7389..f62ecfe58 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -9,7 +9,7 @@ WriteMakefile(
 	      'VERSION_FROM' => 'rpm.pm',		# finds $VERSION
 	      'MAKEFILE'=> 'PMakefile',
 	      'LIBS'	=> [' -L/usr/local/lib  -lz -lbz2'],			# e.g., '-lm' 
-	      'CCFLAGS' => '-O2 -pg -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts',
+	      'CCFLAGS' => '-g -O2 -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts',
 	      'OPTIMIZE'=> '-g',
 	      'DEFINE'	=> '-Dbool=char -DHAS_BOOL',
 	      'INC'	=> ' -I../build -I../lib -I../popt -I/usr/include/rpm',
diff --git a/po/cs.po b/po/cs.po
index 54295691c..ab36e9521 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -23,64 +23,64 @@ msgstr "chybné závislosti pøi sestavování:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nelze otevøít spec soubor %s: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Nelze otevøít rouru pro tar: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Nelze èíst spec soubor %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Nelze pøejmenovat %s: na %s: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "nemohu zjistit stav %s: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Soubor %s není obyèejný soubor\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Nezdá se, ¾e by %s byl spec soubor.\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Sestavuji cílové platformy: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Sestavuji pro cíl %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright (c) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Tento program lze volnì ¹íøit podle podmínek GNU GPL."
@@ -103,12 +103,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <adr>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -118,33 +118,33 @@ msgid ""
 msgstr ""
 "                        [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <adr>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <poèítaè>] [--ftpport <port>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <poèítaè>] [--httpport <port>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate stará_cesta=nová]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <cesta>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] soubor1.rpm ... souborN.rpm"
 
@@ -154,7 +154,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <adr>] [--noscripts]"
 
@@ -164,7 +164,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <soubor>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -174,23 +174,23 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <poèítaè>] [--ftpport <port>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--noorder] [--relocate stará_cesta=nová_cesta]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <cesta>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        soubor1.rpm ... souborN.rpm"
 
@@ -202,19 +202,19 @@ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <adr>] [cíle]"
 
@@ -222,13 +222,13 @@ msgstr "                        [--changelog] [--dbpath <adr>] [cíle]"
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <adr>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [cíle]"
 
@@ -249,11 +249,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <adr>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 "                        [--justdb] [--notriggers] balíèek1 ... balíèekN"
@@ -274,7 +274,7 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           balíèek1 ... balíèekN"
 
@@ -286,15 +286,15 @@ msgstr "       rpm {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr "pou¾ití:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "vypsat tuto zprávu"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "vypsat pou¾ívanou verzi rpm"
 
@@ -306,7 +306,7 @@ msgstr "   v¹echny re¾imy podporují tyto parametry:"
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<jméno> <tìlo>'"
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr "definování makra <jméno> s obsahem <tìlo>"
 
@@ -322,7 +322,7 @@ msgstr "vypsat pou¾ívanou verzi rpm"
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <pøíkaz>       "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "odeslat stdout do <pøíkazu>"
 
@@ -334,15 +334,15 @@ msgstr "      --rcfile <soubor>    "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "pou¾ijte <soubor> místo /etc/rpmrc a $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr "zobrazit finální konfiguraci rpmrc a maker"
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "o nìco upovídanìj¹í reøim"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "velmi upovídaný re¾im (pro ladìní)"
 
@@ -359,7 +359,7 @@ msgstr "   jmen souborù stejnì jako následující volby:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <poèítaè> "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "název poèítaèe nebo IP adresa ftp proxy"
 
@@ -367,7 +367,7 @@ msgstr "název poèítaèe nebo IP adresa ftp proxy"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "èíslo portu serveru ftp (nebo proxy)"
 
@@ -375,7 +375,7 @@ msgstr "èíslo portu serveru ftp (nebo proxy)"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <poèítaè>"
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "název poèítaèe nebo IP adresa http proxy"
 
@@ -383,11 +383,11 @@ msgstr "název poèítaèe nebo IP adresa http proxy"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>    "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "èíslo portu http serveru (nebo proxy)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "re¾im dotazù"
 
@@ -395,7 +395,7 @@ msgstr "re¾im dotazù"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <adr>      "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "pou¾ít <adr> jako adresáø pro databázi"
 
@@ -403,7 +403,7 @@ msgstr "pou¾ít <adr> jako adresáø pro databázi"
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "pou¾ít <qfmt> jako hlavièkový formát (implikuje -i)"
 
@@ -411,7 +411,7 @@ msgstr "pou¾ít <qfmt> jako hlavièkový formát (implikuje -i)"
 msgid "      --root <dir>        "
 msgstr "      --root <adr>        "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì"
 
@@ -467,31 +467,31 @@ msgstr "dotaz na balíèky vy¾adující schopnost <sch>"
 msgid "      Information selection options:"
 msgstr "      Volby pro vybìr informací:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "zobrazit informace o balíèku"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "zobrazit záznamy o zmìnách balíèku"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "zobrazit seznam souborù v balíèku"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "zobrazit stavy souborù (implikuje -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "vypsat pouze soubory s dokumentací (implikuje -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "vypsat pouze konfiguraèní soubory (implikuje -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -515,7 +515,7 @@ msgstr "vytisknout [de]instalaèní skripty"
 msgid "show the trigger scripts contained in the package"
 msgstr "zobrazit spou¹tì (triggery) obsa¾ené v balíèku"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -523,19 +523,20 @@ msgstr ""
 "ovìøit instalaci balíèku pou¾itím stejných voleb pro specifikaci balíèku, "
 "jako pro -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "nekontrolovat závislosti balíèkù"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "nekontrolovat md5 souèty souborù"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "nekontrolovat atributy souborù"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "uvést pøíznaky, které lze pou¾ít v dotazovacím formátu"
 
@@ -547,7 +548,7 @@ msgstr "    --install <balíèek>"
 msgid "    -i <packagefile>      "
 msgstr "    -i <balíèek>     "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "nainstalovat balíèek"
 
@@ -563,11 +564,11 @@ msgstr "pøeskoèit soubory v cestì <cesta>"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "pøemístit soubory ze <staré_cesty> do <nové_cesty>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr "pøemístìní souborù v nepøemístitelném balíèku"
 
@@ -575,48 +576,48 @@ msgstr "pøemístìní souborù v nepøemístitelném balíèku"
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <adr>      "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "pøemístit soubory do <adr>, jsou-li pøemístitelné"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "neinstalovat dokumentaci"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "zkratka pro --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "bìhem instalace balíèku zobrazit dvojité køí¾ky (dobré s -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "nainstalovat v¹echny soubory i konfigurace, které by se jinak mohly vynechat"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "nekontrolovat architekturu balíèku"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "nekontrolovat volné místo na disku pøed instalací"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "nekontrolovat operaèní systém balíèku"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "nainstalovat dokumentaci"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "upravit databázi, ale neupravovat systém souborovù"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "pro vyøe¹ení závislostí nemìnit poøadí instalace balíèkù"
 
@@ -624,23 +625,23 @@ msgstr "pro vyøe¹ení závislostí nemìnit poøadí instalace balíèkù"
 msgid "don't execute any installation scripts"
 msgstr "nespou¹tìt ¾ádné instalaèní skripty"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "bìhem instalace balíèku zobrazit procenta"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "instalovat, i kdy¾ balíèek pøepí¹e existující soubory"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "pøeinstalovat, i kdy¾ je ji¾ balíèek pøítomen"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli"
 
@@ -652,11 +653,11 @@ msgstr "    --upgrade <balíèek>"
 msgid "    -U <packagefile>      "
 msgstr "    -U <balíèek>          "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "aktualizovat balíèek (stejné volby jako --install, plus)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -668,11 +669,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <balíèek>"
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "smazat (deinstalovat) balíèek"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -680,7 +681,7 @@ msgstr ""
 "odstranit v¹echny balíèky odpovídající <balíèku> (obvykle se generuje chyba, "
 "specifikuje-li <balíèek> více balíèkù)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky"
 
@@ -692,52 +693,52 @@ msgstr "    -b<etapa> <spec>      "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etapa> <tarball> "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "sestavit balíèek, kde <etapa> je jedna z:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "pøíprava (rozbalí zdroje a aplikuje záplaty)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrola seznamù (provede zbì¾né kontroly %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompilace (pøíprava a kompilace)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "instalace (pøíprava, kompilace a instalace)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "binární balíèek (pøíprava, kompilace, instalace, zabalení)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src balíèek (pøíprava, kompilace, instalace, zabalení)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "pøeskoèit pøímo na urèenou etapu (pouze pro c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "po dokonèení odstranit sestavovací strom"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr "po dokonèení odstranit zdrojové kódy"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr "po dokonèení odstranit spec soubor"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr "generovat PGP/GPG podpis"
 
@@ -745,7 +746,7 @@ msgstr "generovat PGP/GPG podpis"
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <adr>   "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "pou¾ít <adr> jako koøen pro sestavení"
 
@@ -753,11 +754,11 @@ msgstr "pou¾ít <adr> jako koøen pro sestavení"
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "sestavit balíèek pro cíl platforma1...platformaN."
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "nespou¹tìt ¾ádné etapy"
 
@@ -773,7 +774,7 @@ msgstr "nastavit èasovou kontrolu na <sec> sekund (0 ji deaktivuje)"
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <zdroj_balíèek> "
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -785,7 +786,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <zdroj_balíèek> "
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "jako --rebuild, ale nesestavovat balíèky"
 
@@ -793,7 +794,7 @@ msgstr "jako --rebuild, ale nesestavovat balíèky"
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <balíèek>+   "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "podepsat balíèek (zahodit aktuální podpis)"
 
@@ -801,7 +802,7 @@ msgstr "podepsat balíèek (zahodit aktuální podpis)"
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <balíèek>+  "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "pøidat do balíèku podpis"
 
@@ -813,19 +814,19 @@ msgstr "    --checksig <balíèek>+"
 msgid "    -K <pkg>+             "
 msgstr "    --K <balíèek>+        "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "ovìøit podpis v balíèku"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "vynechat pøípadné PGP podpisy"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr "vynechat pøípadné GPG podpisy"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "vynechat pøípadné MD5 souèty"
 
@@ -837,7 +838,7 @@ msgstr "zajistit, aby existovala platná databáze"
 msgid "rebuild database from existing database"
 msgstr "znovu vytvoøit databázi z existující databáze"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -845,7 +846,7 @@ msgstr ""
 "nastavit oprávnìní k souborùm podle údajù v databázi balíèkù pomocí stejných "
 "voleb pro specifikaci balíèku, jako pro -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -854,37 +855,37 @@ msgstr ""
 "pomocí stejných voleb pro specifikaci balíèku, jako pro -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavní re¾im"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u a --uninstall jsou zastaralé a ji¾ je nelze pou¾ít.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Pou¾ijte volbu -e nebo --erase.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "pøemístìní musejí zaèínat znakem /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "pøemístìní musejí obsahovat ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "pøemístìní musejí mít za znakem = znak /"
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musí zaèínat znakem /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -892,108 +893,108 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "najednou lze provést jen jeden typ dotazu èi ovìøení"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr "neoèekávaný pøíznak pro dotaz"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr "neoèekávaný formát dotazu"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "neoèekávaný zdroj dotazu"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "vynucena mù¾e být jen instalace, aktualizace, smazání zdrojových kódù a spec "
 "souboru"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "soubory mohou být pøemístìny jen pøi instalaci balíèkù"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath je mo¾no pou¾ít jen pøi instalaci nových balíèkù"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix je mo¾no pou¾ít jen pøi instalaci nových balíèkù"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry pro --prefix musejí zaèínat znakem /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "pou¾ít lze jen jeden z parametrù --excludedocs a --includedocs"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mù¾e být pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mù¾e být pou¾it jen pøi instalaci a odstraòování balíèkù"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1009,7 +1010,7 @@ msgstr ""
 "--notriggers mù¾e být pou¾it jen pøi instalaci, odstraòování nebo kontrole "
 "balíèkù"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1017,13 +1018,13 @@ msgstr ""
 "--nodeps mù¾e být pou¾it jen pøi sestavování, rekompilaci, instalaci, "
 "odstraòování a kontrole"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test mù¾e být pou¾it jen pøi instalaci, odstraòování a sestavování"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1031,97 +1032,97 @@ msgstr ""
 "--root (-r) mù¾e být pou¾it jen pøi instalaci, odstraòování, dotazech nebo "
 "znovuvytvoøení databáze"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry pro --root (-r) musejí zaèínat znakem /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage lze pou¾ít jen pøi aktualizacích"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp lze pou¾ít jen pøi kontrole podpisù"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg lze pou¾ít jen pøi kontrole podpisù"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 mù¾e být pou¾it jen pøi kontrole podpisù a ovìøování balíèkù"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr "¾ádné soubory k podepsání\n"
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "pøístup k souboru %s se nezdaøil\n"
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr "pgp nenalezeno: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr "Vlo¾te heslovou frázi: "
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Chybná heslová fráze\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Heslová fráze je v poøádku.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "©patná %%_signature spec v souboru maker.\n"
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign mù¾e být pou¾it jen pøi sestavování balíèkù"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr "spu¹tìní selhalo\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "neoèekávané parametry pro --querytags "
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "ke kontrole podpisu nezadány ¾ádné balíèky"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "k podepsání nezadány ¾ádné balíèky"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "nezadány ¾ádné balíèky pro odstranìní"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "nezadány ¾ádné balíèky pro instalaci"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "k dotazu na v¹echny balíèky zadány parametry navíc"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "k dotazu nezadány ¾ádné parametry"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr "pro kontrolu v¹ech balíèkù zadány parametry navíc"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezadány ¾ádné balíèky"
 
@@ -1143,152 +1144,229 @@ msgstr "chyba pøi pøi ètení hlavièky balíèku\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "nemohu znovu otevøít payload: %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<jméno> <tìlo>'"
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "vypsat pou¾ívanou verzi rpm"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "znovu vytvoøit databázi z existujících databázových hlavièek"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "¾ádné balíèky\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr "pøeskoèit soubory s úvodní cestou <cesta> "
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "balíèek %s-%s-%s je ji¾ nainstalován"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <soubor_balíèku>+ "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "nespou¹tìt ¾ádné etapy"
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "     --relocate <stará_cesta>=<nová_cesta>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "   --upgrade <balíèek>"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+#, fuzzy
+msgid "Signature options:"
+msgstr "Velikost podpisu: %d\n"
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Pou¾ití: %s {--help}\n"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <adr>]\n"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]\n"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <soubor>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]\n"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr "                        [--scripts] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]\n"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [cíl]\n"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [cíl]\n"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<soubor>]\n"
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=platforma1[,platforma2...]]"
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] [--rmspec] spec_soubor"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       %s {--rmsource} [--rcfile <soubor>] [-v] spec_soubor\n"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--rebuild} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--recompile} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "       %s {--freshen -F} soubor1.rpm ... souborN.rpm\n"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 "       %s {--resign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN\n"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 "       %s {--addsign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1296,267 +1374,226 @@ msgid ""
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <soubor>]\n"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr "  V¹echny re¾imy podporují tyto volby:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<jméno> <tìlo>'"
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<pøíkaz>+'     "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "vypsat pou¾ívanou verzi rpm"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <pøíkaz>       "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Pou¾ijte volbu -e nebo --erase.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr "      --dbpath <adr>      "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr "      --root <adr>        "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   Instalace, aktualizace a dotaz (s -p) mohou u¾ívat adresy ve tvaru URL"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr "  na místì jména souboru stejnì jako následující volby:"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr "     --ftpproxy <poèítaè> "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr "     --ftpport <port>     "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr "     --httpproxy <poèítaè> "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr "     --httpport <port>    "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr "      Volby pro specifikaci balíèku:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr "dotázat/ovìøit v¹echny balíèky"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr "     -f <soubor>+         "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr "dotaz/ovìøení balíèku vlastnícího <soubor>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr "     -p <soubor_balíèku>+ "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "dotaz/ovìøení (nenainstalovaného) balíèku <soubor_balíèku>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <balíèek> "
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr "dotaz/ovìøení balíèku aktivovaného <balíèkem>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr "     --whatprovides <cap> "
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr "dotaz/ovìøení balíèkù poskytujících schopnost <cap>"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr "     --whatrequires <cap> "
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr "dotaz/ovìøení balíèkù vy¾adujících schopnost <cap>"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr "     --queryformat <qfmt> "
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr "    Volby pro vybìr informací:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr "uvést schopnosti poskytované balíèkem"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr "uvést schopnosti vy¾adované balíèkem"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr "vytisknout [de]instalaèní skripty"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr "zobrazit spou¹tì (triggery) obsa¾ené v balíèku"
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "nespou¹tìt ¾ádné etapy"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr "   --install <balíèek>"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr "   -i <balíèek>           "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr "     --excludepath <cesta> "
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr "pøeskoèit soubory s úvodní cestou <cesta> "
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr "nespou¹tìt ¾ádné instalaèní skripty"
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr "     --prefix <adr>       "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "     --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr "   --upgrade <balíèek>"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr "   -U <balíèek>           "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr "   --erase <balíèek>"
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr "   -b<etapa> <spec>       "
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr "   -t<etapa> <tarball>    "
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr "pouze zdrojový balíèek"
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr "     --buildroot <adr>    "
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr "     --target=<platforma>+ "
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr "   --rebuild <zdroj_balíèek>"
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr "   --recompile <zdroj_balíèek>"
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr "   --resign <balíèek>+    "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr "   --addsign <balíèek>+   "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <balíèek>+"
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr "   -K <balíèek>+         "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr "inicializovat databázi (není potøeba, zpìtná kompatibilita)"
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr "znovu vytvoøit databázi z existujících databázových hlavièek"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Pou¾ijte volbu -e nebo --erase.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath zadána pro operaci, která databázi nepou¾ívá"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "----notriggers mù¾e být pou¾ito jen pøi instalaci nebo mazání balíèkù"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestavení nezadány ¾ádné balíèky"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "pro sestavení nezadány ¾ádné spec soubory"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány ¾ádné tar soubory"
 
@@ -2817,108 +2854,153 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "tato verze RPM podporuje práci s balíèky s hlavním (major) èíslem <= 4"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr "buildroot ji¾ byl nastaven"
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr "provádím %%prep èást podle spec souboru"
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "pøíprava (rozbalí zdroje a aplikuje záplaty)"
+
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
+msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:124
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr "provádím %%prep èást podle spec souboru"
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:127
+#, fuzzy
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "provádím %%install èást podle spec souboru"
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "kontrola èásti %%files ve spec souboru"
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:133
+#, fuzzy
+msgid "build source and binary packages from <specfile>"
 msgstr "vytvoøení zdrojového a binárního balíèku podle spec souboru"
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:136
+#, fuzzy
+msgid "build binary package only from <specfile>"
 msgstr "vytvoøení binárního balíèku podle spec souboru"
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:139
+#, fuzzy
+msgid "build source package only from <specfile>"
 msgstr "vytvoøení zdrojového balíèku podle spec souboru"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr "provádím %%prep èást z tar souboru"
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "pøíprava (rozbalí zdroje a aplikuje záplaty)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
-msgstr "provádím %%build èást z tar souboru"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
+msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <tarball>"
+msgstr "provádím %%prep èást z tar souboru"
+
+#: lib/poptBT.c:149
+#, fuzzy
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "provádím %%install èást z tar souboru"
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
 msgstr "kontrola èásti %%files z tar souboru"
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:155
+#, fuzzy
+msgid "build source and binary packages from <tarball>"
 msgstr "vytvoøení zdrojového a binárního balíèku z tar souboru"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
 msgstr "vytvoøení binárního balíèku z tar souboru"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
 msgstr "vytvoøení zdrojového balíèku z tar souboru"
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+#, fuzzy
+msgid "build binary package from <source package>"
 msgstr "vytvoøení binárního balíèku ze zdrojového"
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "¾ádné balíèky\n"
+
+#: lib/poptBT.c:168
+#, fuzzy
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "provádím %%install èást ze zdrojového balíèku"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr "build root pøedefinován"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr "nespou¹tìt ¾ádné etapy vytváøení balíèku"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:187
+#, fuzzy
+msgid "do not accept i18N msgstr's from specfile"
 msgstr "ignorovat I18N zprávy ve spec souboru"
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr "po dokonèení odstranit spec soubor"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr "cílová platforma pøedefinována"
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+#, fuzzy
+msgid "lookup i18N strings in specfile catalog"
 msgstr "vyhledat I18N øetìzce katalogu spec souboru"
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+#, fuzzy
+msgid "query/verify package(s) owning file"
 msgstr "dotaz/ovìøení balíèku vlastnícího <soubor>"
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+#, fuzzy
+msgid "query/verify package(s) in group"
 msgstr "dotaz/ovìøení balíèkù ve skupinì"
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+#, fuzzy
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "dotaz/ovìøení souboru s balíèkem"
 
 #: lib/poptQV.c:76
@@ -2933,8 +3015,13 @@ msgstr "zobrazit známé znaèky pro dotazy"
 msgid "query a spec file"
 msgstr "dotaz na spec soubor"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+#, fuzzy
+msgid "query the package(s) triggered by the package"
 msgstr "dotazy na balíèky aktivované balíèkem"
 
 #: lib/poptQV.c:86
@@ -2946,42 +3033,44 @@ msgid "rpm verify mode (legacy)"
 msgstr "re¾im kontroly (zastaralý)"
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr "dotázat balíèky vy¾adující schopnost"
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "dotaz/ovìøení balíèkù vy¾adujících schopnost <cap>"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr "dotázat balíèky poskytující schopnost"
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "dotaz/ovìøení balíèkù poskytujících schopnost <cap>"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr "vypsat v¹echny konfiguraèní soubory"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr "vypsat v¹echny soubory s dokumentací"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr "zobrazit základní informace o souborech"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr "vypsat soubory v balíèku"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr "pou¾ij následující formát dotazù"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr "nahradit i18n sekce do spec souboru"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr "zobrazit stav vypsaných souborù"
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr "zobrazit roz¹íøený výpis souborù"
 
@@ -3868,27 +3957,32 @@ msgstr "spou¹tím pøípadný postdeinstalaèní skript\n"
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "provedení %s-%s-%s skriptu selhalo, návratový kód: %d"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr "nekontrolovat soubory v balíèku"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "nespou¹tìt ¾ádné etapy"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 "balíèek neobsahuje ani u¾ivatelská jména ani seznam id (nemìlo by se nikdy "
 "stát)"
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 "balíèek neobsahuje ani jména skupin ani seznam id (nemìlo by se nikdy stát)"
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "chybí      %s\n"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
@@ -4097,6 +4191,74 @@ msgstr "nemohu otevøít %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
+#~ "<soubor>]\n"
+
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=platforma1[,platforma2...]]"
+
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] [--rmspec] spec_soubor"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       %s {--rmsource} [--rcfile <soubor>] [-v] spec_soubor\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--rebuild} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--recompile} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
+
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "       %s {--freshen -F} soubor1.rpm ... souborN.rpm\n"
+
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "   -b<etapa> <spec>       "
+
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "   -t<etapa> <tarball>    "
+
+#~ msgid "package src rpm only"
+#~ msgstr "pouze zdrojový balíèek"
+
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "     --buildroot <adr>    "
+
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "     --target=<platforma>+ "
+
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "   --rebuild <zdroj_balíèek>"
+
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "   --recompile <zdroj_balíèek>"
+
+#~ msgid "build through %%build stage from spec file"
+#~ msgstr "provádím %%prep èást podle spec souboru"
+
+#~ msgid "build through %%build stage from tar ball"
+#~ msgstr "provádím %%build èást z tar souboru"
+
+#~ msgid "query the packages which require a capability"
+#~ msgstr "dotázat balíèky vy¾adující schopnost"
+
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "dotázat balíèky poskytující schopnost"
+
 #~ msgid "exec failed!\n"
 #~ msgstr "spu¹tìní selhalo!\n"
 
diff --git a/po/da.po b/po/da.po
index c5be95c6b..ba45b2d98 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -23,64 +23,64 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan ikke åbne spec-fil %s: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Kan ikke åbne spec-fil %s: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Kan ikke åbne spec-fil %s: %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "ugyldig flag '%s' ved %s:%d"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "ugyldig flag '%s' ved %s:%d"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Filen er ikke en regulær fil: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Filen %s synes ikke at være en spec-fil.\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Ophavsret (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -102,12 +102,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <kat>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -117,34 +117,34 @@ msgid ""
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <vært>] [--ftpport <port>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <vært>] [--httpport <port>] "
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate gammelsti=nysti]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <sti>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] fil-1.rpm ... fil-N.rpm"
 
@@ -154,7 +154,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <kat>] [--noscripts]"
 
@@ -164,7 +164,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -174,22 +174,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <vært>] [--httpport <port>] "
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate gammelsti=nysti]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <sti>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        fil-1.rpm ... fil-N.rpm"
 
@@ -201,22 +201,22 @@ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [mål]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <kat>] [mål]"
 
@@ -224,13 +224,13 @@ msgstr "                        [--changelog] [--dbpath <kat>] [mål]"
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [mål]"
 
@@ -251,11 +251,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <kat>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] rpakke1 ... pakkeN"
@@ -274,7 +274,7 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           pakke1 ... pakkeN"
 
@@ -286,15 +286,15 @@ msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr "Brug:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "vis denne meddelse"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "vis versionen af rpm som benyttes"
 
@@ -306,7 +306,7 @@ msgstr "   Alle tilstande understøtter følgende argumenter:"
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<name> <body>'"
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr "definér makro <name> med værdi <body>"
 
@@ -322,7 +322,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <kmd>          "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -334,15 +334,15 @@ msgstr "    --rcfile <fil>        "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -358,7 +358,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <vært>   "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -366,7 +366,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <vært>  "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -382,11 +382,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -394,7 +394,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <kat>      "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -402,7 +402,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -410,7 +410,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -466,31 +466,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -512,25 +512,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -542,7 +543,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "installér pakke"
 
@@ -558,11 +559,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -570,47 +571,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>  "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "installér ikke dokumentation"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -618,23 +619,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -646,11 +647,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -660,17 +661,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <pakke>"
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "slet (afinstallér) pakke"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -682,52 +683,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompilér (forbered og kompilér)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "installér (forbered, kompilér og installér)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -735,7 +736,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -743,11 +744,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -763,7 +764,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -773,7 +774,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -781,7 +782,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pakke>+     "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -789,7 +790,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pakke>+    "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "tilføj signatur til pakke"
 
@@ -801,19 +802,19 @@ msgstr "    --checksig <pakke>+"
 msgid "    -K <pkg>+             "
 msgstr "    -K <pakke>+           "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "verificér pakke signatur"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -825,50 +826,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -876,105 +877,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -986,115 +987,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage må kun bruges under opgraderinger"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp må kun bruges under signaturkontrollering"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg må kun bruges under signaturkontrollering"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr "pgp ikke fundet: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1116,149 +1117,221 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<name> <body>'"
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
-msgstr ""
+#: rpmqv.c:159
+#, fuzzy
+msgid "print macro expansion of <expr>+"
+msgstr "vis versionen af rpm som benyttes"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "ingen pakker\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "forespørg alle pakker"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Brug: %s {--help}\n"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <katalog>]\n"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]\n"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]\n"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]\n"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [mål]\n"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [mål]\n"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<fil>]\n"
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=platform1[,platform2...]]"
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] [--rmspec] spec-fil"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] 'spec'-fil\n"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--rebuild} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--recompile} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN\n"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1266,266 +1339,226 @@ msgid ""
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<name> <body>'"
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<name>+'       "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "vis versionen af rpm som benyttes"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr "   --pipe <kmd>           "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "    --rcfile <fil>        "
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr "   --dbpath <katalog>     "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr "   --root <katalog>       "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    --eval '<name>+'      "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "    --rcfile <fil>        "
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2776,108 +2809,138 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "ingen pakker\n"
+
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
-msgstr ""
+#, fuzzy
+msgid "query/verify package(s) owning file"
+msgstr "verificér pakke signatur"
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
-msgstr ""
+#, fuzzy
+msgid "query/verify package(s) in group"
+msgstr "verificér pakke signatur"
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2892,8 +2955,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2905,42 +2972,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3800,24 +3867,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
@@ -4025,6 +4096,41 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+#~ "<fil>]\n"
+
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=platform1[,platform2...]]"
+
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] [--rmspec] spec-fil"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] 'spec'-fil\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--rebuild} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--recompile} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
+
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
+
 #~ msgid "   --rcfile <file>        "
 #~ msgstr "   --rcfile <fil>         "
 
diff --git a/po/de.po b/po/de.po
index 5637bf3ee..459bdf659 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -62,68 +62,68 @@ msgid "Unable to open spec file %s: %s\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
 # , c-format
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s scheint kein RPM-Paket zu sein\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s scheint kein RPM-Paket zu sein\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
 # , c-format
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Version %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright © 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Dies darf unter den Bedingungen der »GNU GPL« frei verteilt werden"
@@ -146,12 +146,12 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <VERZ>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -161,36 +161,36 @@ msgid ""
 msgstr ""
 "                        [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <VERZ>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate <ALTPFAD>=<NEUPFAD>]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
@@ -200,7 +200,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <VERZ>] [--noscripts]"
 
@@ -210,7 +210,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -221,22 +221,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate <ALTPFAD>=<NEUPFAD>]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
@@ -249,23 +249,23 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <VERZ>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [ZIELE]"
@@ -274,14 +274,14 @@ msgstr "                        [--nomd5] [ZIELE]"
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <VERZ>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [ZIELE]"
 
@@ -303,11 +303,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <VERZ>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] PAKET1 ... PAKETn"
@@ -326,7 +326,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           PAKET1 ... PAKETn"
 
@@ -338,16 +338,16 @@ msgstr "       rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "Benutzung:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "Gibt diesen Text aus"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "Die benutzte RPM-Version anzeigen"
 
@@ -360,7 +360,7 @@ msgstr "   alle Modi unterstützen folgende Argumente:"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr "Die benutzte RPM-Version anzeigen"
 msgid "    --pipe <cmd>          "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
 
@@ -392,15 +392,15 @@ msgstr "    -b<STUFE> <SPEC>      "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "<DATEI> anstelle von /etc/rpmrc und $HOME/.rpmrc benutzen"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "Ausgabe etwas ausführlicher gestalten"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "extrem ausführliche Ausgabe (um Programm-Fehler zu finden)"
 
@@ -420,7 +420,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "Hostname oder IP des ftp-Proxys"
 
@@ -428,7 +428,7 @@ msgstr "Hostname oder IP des ftp-Proxys"
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "Portnummer des ftp-Servers (oder -Proxys)"
 
@@ -437,7 +437,7 @@ msgstr "Portnummer des ftp-Servers (oder -Proxys)"
 msgid "      --httpproxy <host>  "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "Hostname oder IP des ftp-Proxys"
@@ -447,12 +447,12 @@ msgstr "Hostname oder IP des ftp-Proxys"
 msgid "      --httpport <port>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "Portnummer des ftp-Servers (oder -Proxys)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "Anfrage-Modus"
 
@@ -461,7 +461,7 @@ msgstr "Anfrage-Modus"
 msgid "      --dbpath <dir>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "<VERZ> als Datenbankverzeichnis benutzen"
 
@@ -469,7 +469,7 @@ msgstr "<VERZ> als Datenbankverzeichnis benutzen"
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "S als Kopfzeilen-Format benutzen (impliziert -i)"
@@ -478,7 +478,7 @@ msgstr "S als Kopfzeilen-Format benutzen (impliziert -i)"
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "<VERZ> als Stammverzeichnis benutzen"
 
@@ -540,31 +540,31 @@ msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 msgid "      Information selection options:"
 msgstr "      Optionen der Informationsauswahl:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "Paketinformationen anzeigen"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "Changelog des Pakets anzeigen"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "Dateiliste des Pakets anzeigen"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "Status der Dateien anzeigen (impliziert -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "Nur Dokumentationsdateien auflisten (impliziert -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -588,26 +588,27 @@ msgstr "Die diversen (De-)Installations-Skripte ausgeben"
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 "Ein Paket mit denselben Paketspezifikations-Optionen wie bei -q überprüfen"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "md5-Prüfsumme der Datei nicht überprüfen"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "Dateiattribute nicht überprüfen"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "Tags auflisten, die im Anfrageformat benutzt werden können"
 
@@ -621,7 +622,7 @@ msgstr "Paket installieren"
 msgid "    -i <packagefile>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "Paket installieren"
 
@@ -639,11 +640,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "Paket %s ist nicht installiert\n"
@@ -652,50 +653,50 @@ msgstr "Paket %s ist nicht installiert\n"
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "Dokumentation nicht installieren"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "Abkürzung für --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "alle Dateien installieren, auch die config-Dateien, die sonst übergangen "
 "würden"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "Paket-Betriebssystem nicht überprüfen"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "Dokumentation installieren"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen"
@@ -704,23 +705,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "Prozentangabe bei der Paketinstallation ausgeben"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
 
@@ -733,11 +734,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "Paket aktualisieren (dieselben Optionen wie --install, außerdem)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -749,11 +750,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "Paket löschen (deinstallieren)"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -761,7 +762,7 @@ msgstr ""
 "Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird "
 "ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "Keine paketspezifischen Skripte ausführen"
 
@@ -774,58 +775,58 @@ msgstr "    -b<STUFE> <SPEC>      "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "Paket erstellen, <STUFE> ist einer der Buchstaben:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden"
 
 # , c-format
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrollieren (oberflächliche Überprüfung der %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompilieren (präparieren und kompilieren)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "installieren (präparieren, kompilieren, installieren)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 "Binärpaket erstellen (präparieren, kompilieren, installieren und paketieren)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "Binär- und Quellpaket erstellen (präparieren, kompilieren, installieren und "
 "Paketieren"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "Direkt zur angegeben Stufe springen (nur für c und i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "Erstellungsdateibaum nach Beendigung löschen"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP-Signatur generieren"
@@ -835,7 +836,7 @@ msgstr "PGP-Signatur generieren"
 msgid "      --buildroot <dir>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
 
@@ -843,11 +844,11 @@ msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "Keine Stufen ausführen"
 
@@ -865,7 +866,7 @@ msgstr "Die Zeitüberprüfung auf S Sekunden setzen (mit 0 ausschalten)"
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -877,7 +878,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "wie --rebuild aber kein Paket erstellen"
 
@@ -886,7 +887,7 @@ msgstr "wie --rebuild aber kein Paket erstellen"
 msgid "    --resign <pkg>+       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
@@ -895,7 +896,7 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "Signatur einem Paket hinzufügen"
 
@@ -909,20 +910,20 @@ msgstr "    -b<STUFE> <SPEC>      "
 msgid "    -K <pkg>+             "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "Paketsignatur überprüfen"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "alle PGP-Signaturen überspringen"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "alle PGP-Signaturen überspringen"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "alle MD5-Signaturen überspringen"
 
@@ -935,7 +936,7 @@ msgid "rebuild database from existing database"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
 # Was ist gemeint?
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -944,7 +945,7 @@ msgstr ""
 "Paketspezifikationsoptionen wie bei -q benutzt würden"
 
 # Was ist gemeint?
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -953,38 +954,38 @@ msgstr ""
 "wenn dieselben Paketspezifikationsoptionen wie bei -q benutzt würden"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "Es darf nur ein Hauptmodus angegeben werden"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u und --uninstall sind veraltet und funktionieren nicht mehr.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Benutzen Sie stattdessen -e oder --erase\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "Verschiebungen müssen ein »=« beinhalten"
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "bei Verschiebungen muss ein »/« dem »=« folgen"
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -992,115 +993,115 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 "Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
 "werden"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "Dateien können nur während der Paketinstallation verschoben werden"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente zu --prefix müssen mit einem / beginnen"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1116,7 +1117,7 @@ msgstr ""
 "--notriggers darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1125,7 +1126,7 @@ msgstr ""
 "--nodeps darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1133,7 +1134,7 @@ msgstr ""
 "--test darf nur während der Paketinstallation, -deinstallation und "
 "-erstellung angegeben werden"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1141,103 +1142,103 @@ msgstr ""
 "--root (-r) darf nur während der Paketinstallation, -deinstallation, "
 "-anfrage und Datenbankneuerstellungen angegeben werden"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage darf nur während Aktualisierungen benutzt werden"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nopgp darf nur während der Signatur- und Paketüberprüfung angegeben werden"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign darf nur während der Paketerstellung benutzt werden"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "Unerwartete Argumente zu --querytags "
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "Es wurden keine Pakete für die Signaturüberprüfung angegeben"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "Es wurden keine Pakete für die Signatur angeben"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
@@ -1260,452 +1261,478 @@ msgstr "Fehler beim Suchen nach Paket %s\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "Die benutzte RPM-Version anzeigen"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "Datenbank aus der vorhandenen neu erstellen"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "Anfrage an alle Pakete"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "Paket %s ist nicht installiert\n"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "    -b<STUFE> <SPEC>      "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "Keine Stufen ausführen"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "Paket installieren"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Benutzung: rpm {--help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <VERZ>]"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr "                        [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [ZIEL]"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [ZIEL]"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<DATEI>]"
-
-#: rpmqv.c:350
-#, fuzzy
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [ZIELE]"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--buildarch <ARCH>] [--rmsource] SPEC-DATEI"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       rpm {--rmsource} [--rcfile <DATAEI>] [-v] SPEC-DATEI"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--rebuild} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--recompile} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   alle Modi unterstützen folgende Argumente:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "Die benutzte RPM-Version anzeigen"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Benutzen Sie stattdessen -e oder --erase\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   Installieren, Aktualisieren und Anfragen (mit -p) erlauben es, ftp-URLs"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr ""
 "   anstelle von Dateinamen zu benutzen. Außerdem die folgenden Optionen:\n"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Optionen der Paketauswahl:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Anfrage an alle Pakete"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "Anfrage nach (nicht installiertem) Paket <PAKET-DATEI>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Optionen der Informationsauswahl:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "Fähigkeiten des Pakets auflisten"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "Fähigkeiten des Pakets auflisten"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "Die diversen (De-)Installations-Skripte ausgeben"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "Keine Stufen ausführen"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "Paket installieren"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "Paket installieren"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "Paket installieren"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "Paket hat keinen Namen"
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    -b<STUFE> <SPEC>      "
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Benutzen Sie stattdessen -e oder --erase\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath wurde für eine Operation angeben, die keine Datenbank benutzt"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
@@ -1713,15 +1740,15 @@ msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
@@ -3033,123 +3060,152 @@ msgid ""
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "Paket installieren"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
+
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/poptBT.c:137
+#: lib/poptBT.c:161
 #, fuzzy
-msgid "build source package from tar ball"
+msgid "build source package only from <tarball>"
 msgstr "Erstelle die Pakete für das Betriebssystem <BS>"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr ""
 "Binärpaket erstellen (präparieren, kompilieren, installieren und paketieren)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid "<source package>"
+msgstr "Anfrage an alle Pakete"
+
+#: lib/poptBT.c:168
+#, fuzzy
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "Paket installieren"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 #, fuzzy
 msgid "override build root"
 msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "Paket hat keinen Namen"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "Anfrage an alle Pakete"
 
 #: lib/poptQV.c:76
@@ -3166,9 +3222,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
 #, fuzzy
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
 #: lib/poptQV.c:86
@@ -3183,49 +3243,49 @@ msgstr "Anfrage-Modus"
 
 #: lib/poptQV.c:90
 #, fuzzy
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 
 #: lib/poptQV.c:92
 #, fuzzy
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Dokumentation installieren"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "dump basic file information"
 msgstr "Paketinformationen anzeigen"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 #, fuzzy
 msgid "list files in package"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "use the following query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "Dateiliste des Pakets anzeigen"
@@ -4122,25 +4182,30 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "Paket installieren"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "Keine Stufen ausführen"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "fehlende { nach %{"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
@@ -4363,6 +4428,81 @@ msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
+#~ "<DATEI>]"
+
+#, fuzzy
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [ZIELE]"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr ""
+#~ "                        [--buildarch <ARCH>] [--rmsource] SPEC-DATEI"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       rpm {--rmsource} [--rcfile <DATAEI>] [-v] SPEC-DATEI"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--rebuild} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--recompile} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "Paket hat keinen Namen"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    -b<STUFE> <SPEC>      "
+
+#, fuzzy
+#~ msgid "query the packages which require a capability"
+#~ msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
+
+#, fuzzy
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
+
+#, fuzzy
 #~ msgid "exec failed!\n"
 #~ msgstr "%s: Öffnen fehlgeschlagen\n"
 
diff --git a/po/es.po b/po/es.po
index a7349a907..48735c064 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 8eb84fcc9..aaee5bb8c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -24,63 +24,63 @@ msgstr "puuttuvat riippuvuudet:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "%s:n avaus epäonnistui\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "En voi lukea %s: %s."
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "En voi lukea %s: %s."
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "en voinut avata %s: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s ei vaikuta RPM-paketilta\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s ei vaikuta RPM-paketilta\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
@@ -103,12 +103,12 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <hakem>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -119,35 +119,35 @@ msgstr ""
 "                        [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
 "<hakem>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <hakem>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate vanhapolku=uusipolku]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
@@ -157,7 +157,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <hakem>] [--noscripts]"
 
@@ -167,7 +167,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -179,21 +179,21 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate vanhapolku=uusipolku]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
@@ -207,23 +207,23 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <hakem>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [kohteet]"
@@ -233,14 +233,14 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <hakem>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [kohteet]"
 
@@ -262,11 +262,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <hakem>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] paketti1 ... pakettiN"
@@ -287,7 +287,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           paketti1 ... pakettiN"
 
@@ -299,16 +299,16 @@ msgstr "       rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "käyttö:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "tulosta tämä viesti"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "tulosta käytetyn rpm:n versio"
 
@@ -321,7 +321,7 @@ msgstr "   kaikki moodit tukevat seuraavia parametrejä"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgstr "tulosta käytetyn rpm:n versio"
 msgid "    --pipe <cmd>          "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "lähetä vakiotuloste <komento>:lle"
 
@@ -353,15 +353,15 @@ msgstr "    -b<vaihe> <määrittely> "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "käytä <tiedosto> eikä /etc/rpmrc tai $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "tulosta enemmän viestejä"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "tulosta mahdollisimman paljon viestejä (vianetsintään)"
 
@@ -381,7 +381,7 @@ msgstr "   tiedostoniminä, kuten myös seuraavia parametrejä:\n"
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "koneen nimi tai IP tai ftp-proxy"
 
@@ -389,7 +389,7 @@ msgstr "koneen nimi tai IP tai ftp-proxy"
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp-palvelijan (tai proxyn) porttinumero"
 
@@ -398,7 +398,7 @@ msgstr "ftp-palvelijan (tai proxyn) porttinumero"
 msgid "      --httpproxy <host>  "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "koneen nimi tai IP tai ftp-proxy"
@@ -408,12 +408,12 @@ msgstr "koneen nimi tai IP tai ftp-proxy"
 msgid "      --httpport <port>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "ftp-palvelijan (tai proxyn) porttinumero"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "kyselymoodi"
 
@@ -422,7 +422,7 @@ msgstr "kyselymoodi"
 msgid "      --dbpath <dir>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "kaytä <hakem> tietokannan hakemistona"
 
@@ -430,7 +430,7 @@ msgstr "kaytä <hakem> tietokannan hakemistona"
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "käytä s headerin formaatina (josta seuraa -i)"
@@ -439,7 +439,7 @@ msgstr "käytä s headerin formaatina (josta seuraa -i)"
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "käytä <hakem> ylimpänä hakemistona"
 
@@ -501,31 +501,31 @@ msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 msgid "      Information selection options:"
 msgstr "      Tietojen valintaparametrit:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "näytä paketin tiedot"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "näytä paketin muutosloki"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "näytä paketin tiedostolistaus"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "näytä tiedostojen tilat (josta seuraa -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "listaa vain dokumettitiedostot (josta seuraa -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -549,7 +549,7 @@ msgstr "tulosta erinäiset asennus/poisto-skriptit"
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -557,19 +557,20 @@ msgstr ""
 "tarkista paketin asennus käyttäen samoja paketin määrittelyparametrejä kuin "
 "-q "
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "älä tarkista tiedostojen md5-tarkistussummia"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "älä tarkista tiedostojen ominaisuuksia"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "luettele nimiöt, joita voidaan käyttää kyselyn formaatissa"
 
@@ -583,7 +584,7 @@ msgstr "asenna paketti"
 msgid "    -i <packagefile>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "asenna paketti"
 
@@ -601,11 +602,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "paketti %s ei ole asennettu\n"
@@ -614,48 +615,48 @@ msgstr "paketti %s ei ole asennettu\n"
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "älä asenna dokumentointia"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "lyhenne parametreille --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "älä tarkista paketin käyttöjärjestelmää"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "asenna dokumentaatio"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
 
@@ -663,23 +664,23 @@ msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
 msgid "don't execute any installation scripts"
 msgstr "älä suorita asennusskriptejä"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "tulosta asennuksen eteneminen prosentteina"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "asenna uudelleen, jos paketti on jo asennettu"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "älä asenna, mutta kerro onnistuisiko se"
 
@@ -692,11 +693,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "päivitä paketti (samat parametrit kuin --install, plus)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -708,11 +709,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "poista paketti"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -720,7 +721,7 @@ msgstr ""
 "poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  "
 "<paketti> määrittää useita paketteja, tulee virhe)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "älä aja mitään pakettikohtaisia skriptejä"
 
@@ -733,54 +734,54 @@ msgstr "    -b<vaihe> <määrittely> "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "tee paketti, jossa <vaihe> on jokin:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "valmistele (pura lähdekoodi ja tee korjaukset)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "listatarkistus (tee joitakin tarkistuksia %tiedostoihin)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "käännä (valmistele ja käännä)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "asenna (valmistele, käännä ja asenna)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "binääripaketti (valmistele, käännä, asenna, paketoi)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src-paketti (valmistele, käännä, asenna, paketoi)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "siirry suoraan määriteltyyn vaiheeseen (vain c ja i yhteydessä)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "poista käännöspuu, kun valmis"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "generoi PGP-allekirjoitus"
@@ -790,7 +791,7 @@ msgstr "generoi PGP-allekirjoitus"
 msgid "      --buildroot <dir>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "käytä <hakem> käännöspuun juurena"
 
@@ -798,11 +799,11 @@ msgstr "käytä <hakem> käännöspuun juurena"
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "älä suorita mitään vaiheita"
 
@@ -820,7 +821,7 @@ msgstr "aseta aikatarkistus S sekunniksi (0 ohittaa)"
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -832,7 +833,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "kuten --rebuild, mutta ei käännä paketteja"
 
@@ -841,7 +842,7 @@ msgstr "kuten --rebuild, mutta ei käännä paketteja"
 msgid "    --resign <pkg>+       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
@@ -850,7 +851,7 @@ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "lisää allekirjoitus pakettiin"
 
@@ -864,20 +865,20 @@ msgstr "    -b<vaihe> <määrittely> "
 msgid "    -K <pkg>+             "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "tarkista paketin allekirjoitus"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "ohita PGP-allekirjoitukset"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "ohita PGP-allekirjoitukset"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "ohita MD5-allekirjoitukset"
 
@@ -889,7 +890,7 @@ msgstr "tarkista, että kunnollinen tietokanta löytyy"
 msgid "rebuild database from existing database"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -897,7 +898,7 @@ msgstr ""
 "aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa "
 "käyttäen samoja pakettien määrittelyparametrejä kuin -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -906,38 +907,38 @@ msgstr ""
 "tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "vain yksi päämoodi voidaan määritellä"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ja --uninstall ovat vanhentuneet eivätkä enää toimi.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Käytä sen sijaan -e tai --erase .\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "siirroissa pitää olla =-merkki"
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "siirroissa pitää olla / =-merkin jälkeen"
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -945,111 +946,111 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vain asennus tai päivitys voidaan pakottaa"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "vain toinen --prefix tai --relocate voidaan antaa"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pitää alkaa /-merkillä"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1066,7 +1067,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1075,7 +1076,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1083,7 +1084,7 @@ msgstr ""
 "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
 "käännettäessä"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1091,24 +1092,24 @@ msgstr ""
 "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
 "kyseltäessä ja tietokannan uudelleenluonnissa"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkillä"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage: voidaan käyttää vain paketteja päivitettäessä"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
@@ -1116,79 +1117,79 @@ msgstr ""
 "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa ja paketteja "
 "todennettaessa"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags: odottamattomia parametrejä"
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "allekirjoituksen tarkistukselle ei määritelty paketteja"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "allekirjoitukselle ei määritelty paketteja"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "poistolle ei määritelty paketteja"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrejä"
 
@@ -1211,49 +1212,169 @@ msgstr "virhe etsittäessä pakettia %s\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "kysele kaikki paketit"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "paketti %s ei ole asennettu\n"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "    -b<vaihe> <määrittely> "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "älä suorita mitään vaiheita"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "asenna paketti"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "käyttö: rpm {--help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <hakem>]"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
@@ -1261,157 +1382,109 @@ msgstr ""
 "                        [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
 "<hakem>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [kohde]"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [kohde]"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<tiedosto>]"
-
-#: rpmqv.c:350
-#, fuzzy
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [kohteet]"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-"                        [--buildarch <arkk>] [--rmsource] määrittelytiedosto"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
-"lähdekoodiN.rpm"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
-"lähdekoodiN.rpm"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 "       rpm {--resign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   kaikki moodit tukevat seuraavia parametrejä"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Käytä sen sijaan -e tai --erase .\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1419,267 +1492,218 @@ msgstr ""
 "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja "
 "voidaan käyttää"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   tiedostoniminä, kuten myös seuraavia parametrejä:\n"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Paketin määrittelyparametrit:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "kysele kaikki paketit"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "kysele(asentamatonta) pakettia <pakettitiedosto>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Tietojen valintaparametrit:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "luettele paketin tarjoamat ominaisuudet"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "luettele paketin tarjoamat ominaisuudet"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "tulosta erinäiset asennus/poisto-skriptit"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "älä suorita mitään vaiheita"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "asenna paketti"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "älä suorita asennusskriptejä"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "asenna paketti"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "asenna paketti"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "paketilla ei ole nimeä"
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    -b<vaihe> <määrittely> "
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Käytä sen sijaan -e tai --erase .\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "uudelleenkäännolle ei määritelty paketteja"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "käännökselle ei annettu määrittelytiedostoja"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
@@ -2951,122 +2975,151 @@ msgid ""
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "valmistele (pura lähdekoodi ja tee korjaukset)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "asenna paketti"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "valmistele (pura lähdekoodi ja tee korjaukset)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
+
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/poptBT.c:137
+#: lib/poptBT.c:161
 #, fuzzy
-msgid "build source package from tar ball"
+msgid "build source package only from <tarball>"
 msgstr "käännä paketit käyttöjärjestelmälle <kj>"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "binääripaketti (valmistele, käännä, asenna, paketoi)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "kysele kaikki paketit"
+
+#: lib/poptBT.c:168
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "asenna paketti"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 #, fuzzy
 msgid "override build root"
 msgstr "käytä <hakem> käännöspuun juurena"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "paketilla ei ole nimeä"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "kysele kaikki paketit"
 
 #: lib/poptQV.c:76
@@ -3083,9 +3136,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "%s:n kysely ei onnistunut\n"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
 #, fuzzy
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
 #: lib/poptQV.c:86
@@ -3100,49 +3157,49 @@ msgstr "kyselymoodi"
 
 #: lib/poptQV.c:90
 #, fuzzy
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 
 #: lib/poptQV.c:92
 #, fuzzy
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all configuration files"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr "asenna dokumentaatio"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "dump basic file information"
 msgstr "näytä paketin tiedot"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 #, fuzzy
 msgid "list files in package"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "use the following query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "näytä paketin tiedostolistaus"
@@ -4021,25 +4078,30 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "asenna paketti"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "älä suorita mitään vaiheita"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
@@ -4259,6 +4321,85 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
+#~ "<tiedosto>]"
+
+#, fuzzy
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [kohteet]"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr ""
+#~ "                        [--buildarch <arkk>] [--rmsource] määrittelytiedosto"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr ""
+#~ "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
+#~ "lähdekoodiN.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
+#~ "lähdekoodiN.rpm"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr ""
+#~ "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "paketilla ei ole nimeä"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    -b<vaihe> <määrittely> "
+
+#, fuzzy
+#~ msgid "query the packages which require a capability"
+#~ msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
+
+#, fuzzy
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
+
+#, fuzzy
 #~ msgid "exec failed!\n"
 #~ msgstr "%s: avaus ei onnistunut\n"
 
diff --git a/po/fr.po b/po/fr.po
index ff26cf6e4..79e525602 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-12-30 13:33-0500\n"
+msgstr "POT-Creation-Date: 2001-01-01 18:02-0500\n"
 
 #: build.c:26
 #, fuzzy, c-format
@@ -16,63 +16,63 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Peut être redistribué librement selon les termes de la GNU GPL"
@@ -94,12 +94,12 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 #, fuzzy
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -108,34 +108,34 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 #, fuzzy
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
@@ -145,7 +145,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 #, fuzzy
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
@@ -156,7 +156,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -166,21 +166,21 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
@@ -193,21 +193,21 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "    -q                  - mode interrogation"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "        -a                - interroge l'ensemble des packages"
@@ -216,12 +216,12 @@ msgstr "        -a                - interroge l'ensemble des packages"
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 #, fuzzy
 msgid "                        [--nomd5] [targets]"
 msgstr "    -q                  - mode interrogation"
@@ -243,12 +243,12 @@ msgstr "        -l                - affiche la liste des packages"
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 #, fuzzy
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
@@ -268,7 +268,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 #, fuzzy
 msgid "                           package1 ... packageN"
 msgstr "                          qui matchent <pkg>"
@@ -281,16 +281,16 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 #, fuzzy
 msgid "print this message"
 msgstr "   --help\t\t- affiche ce message"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 #, fuzzy
 msgid "print the version of rpm being used"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
@@ -303,7 +303,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -322,7 +322,7 @@ msgstr "   --version\t\t- affiche la version de rpm utilisée"
 msgid "    --pipe <cmd>          "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -335,15 +335,15 @@ msgstr "    -i <packagefile>\t- installe le package"
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -385,11 +385,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -397,7 +397,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -413,7 +413,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 #, fuzzy
 msgid "use <dir> as the top level directory"
 msgstr "      --root <dir>\t- utilise <dir> comme répertoire racine"
@@ -477,41 +477,41 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr "      Options de sélection d'information:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 #, fuzzy
 msgid "display package information"
 msgstr ""
 "        -i                - affiche les informations relatives à un package"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 #, fuzzy
 msgid "display package file list"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 #, fuzzy
 msgid "show file states (implies -l)"
 msgstr "        -s                - montre l'état des fichiers (implique -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 #, fuzzy
 msgid "list only documentation files (implies -l)"
 msgstr ""
 "        -d                - donne uniquement la liste des fichiers de "
 "documentation (implique -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 #, fuzzy
 msgid "list only configuration files (implies -l)"
 msgstr ""
 "        -c                - donne uniquement la liste des fichiers de "
 "configuration (implique -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -533,26 +533,27 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 #, fuzzy
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "\t\t\t  mêmes options de spécification de package qu'avec -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -567,7 +568,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -583,11 +584,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "aucun package n'a été spécifié pour l'installation"
@@ -596,51 +597,51 @@ msgstr "aucun package n'a été spécifié pour l'installation"
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 #, fuzzy
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 #, fuzzy
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "      --hash            - affiche des '#' pendant l'installation du package "
 "(utile avec -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -648,29 +649,29 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 #, fuzzy
 msgid "print percentages as package installs"
 msgstr ""
 "      --percent         - affiche des '%' pendant l'installation du package"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 #, fuzzy
 msgid "install even if the package replaces installed files"
 msgstr ""
 "      --replacefiles    - installe même si le package remplace des fichiers "
 "déjà présents"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 #, fuzzy
 msgid "reinstall if the package is already present"
 msgstr "      --replacepkgs      - réinstalle si le package est déjà présent"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 #, fuzzy
 msgid "don't install, but tell if it would work or not"
 msgstr ""
@@ -686,14 +687,14 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 #, fuzzy
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 "    -U <packagefile>\t- mise à jour du package (mêmes options que --install, "
 "plus)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 #, fuzzy
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
@@ -706,17 +707,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -728,64 +729,64 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 #, fuzzy
 msgid "build package, where <stage> is one of:"
 msgstr "    -b<stage> <spec>    - construit le package, <stage> peut valoir:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 #, fuzzy
 msgid "prep (unpack sources and apply patches)"
 msgstr "\t\t\t  p - prépare (extrait le source et applique les patches)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, fuzzy, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "\t\t\t  l - liste vérif (effectue quelques vérifications sur %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 #, fuzzy
 msgid "compile (prep and compile)"
 msgstr "\t\t\t  c - compile (prépare et compile)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 #, fuzzy
 msgid "install (prep, compile, install)"
 msgstr "\t\t\t  i - installe (prépare, compile, installe)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 #, fuzzy
 msgid "binary package (prep, compile, install, package)"
 msgstr "\t\t\t  b - package binaire (prépare, compile, installe, package)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 #, fuzzy
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "\t\t\t  a - package bin/src (prépare, compile, installe, package)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 #, fuzzy
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 "      --short-circuit   - passe directement à l'étape spécifiée (seulement "
 "pour c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 #, fuzzy
 msgid "remove build tree when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "      --sign            - genère une signature PGP"
@@ -794,7 +795,7 @@ msgstr "      --sign            - genère une signature PGP"
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -802,11 +803,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -826,7 +827,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 #, fuzzy
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
@@ -839,7 +840,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -848,7 +849,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -856,7 +857,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -870,20 +871,20 @@ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 msgid "    -K <pkg>+             "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "      --sign            - genère une signature PGP"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -895,53 +896,53 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut être spécifié"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 #, fuzzy
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u et --uninstall sont obsolètes et seront bientôt supprimés.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Utilisez de préférence -e ou --erase.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 #, fuzzy
 msgid "relocations must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -949,136 +950,136 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "un seul type de requête/vérification peut être effectué à la fois"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "source de requête inattendue"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "source de requête inattendue"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "source de requête inattendue"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "seules l'installation et la mise à jour peuvent être forcées"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr ""
 "--replacefiles ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "un seul mode majeur peut être spécifié"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--clean ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 #, fuzzy
 msgid "--prefix may only be used when installing new packages"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 #, fuzzy
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 #, fuzzy
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 #, fuzzy
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 #, fuzzy
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "un seul mode majeur peut être spécifié"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 #, fuzzy
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 #, fuzzy
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 #, fuzzy
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--replacepkgs ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 #, fuzzy
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
@@ -1096,7 +1097,7 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1105,7 +1106,7 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 #, fuzzy
 msgid ""
 "--test may only be specified during package installation, erasure, and "
@@ -1114,7 +1115,7 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 #, fuzzy
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
@@ -1123,105 +1124,105 @@ msgstr ""
 "--root (-r) ne peut être spécifié que lors de l'installation, de la "
 "désinstallation ou de l'interrogation d'un package"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage ne peut être spécifié que lors de mises à jour"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 #, fuzzy
 msgid "--nopgp may only be used during signature checking"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 #, fuzzy
 msgid "pgp not found: "
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "La vérification du mot de passe a échoué\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Mot de passe correct.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 #, fuzzy
 msgid "exec failed\n"
 msgstr "La construction a échoué.\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "aucun package n'a été spécifié pour la vérification de signature"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 #, fuzzy
 msgid "no packages given for signing"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 #, fuzzy
 msgid "extra arguments given for query of all packages"
 msgstr "aucun argument n'a été fourni pour la requête"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "aucun argument n'a été fourni pour la requête"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "aucun argument n'a été fourni pour la requête"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "aucun argument n'a été fourni pour la vérification"
 
@@ -1243,438 +1244,468 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "aucun package n'a été spécifié pour l'installation"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "aucun package n'a été spécifié pour l'installation"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "    -i <packagefile>\t- installe le package"
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+"        -f <file>+        - interroge le package à qui appartient <file>"
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr ""
+"        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "        -i                - affiche les informations relatives à un package"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-#, fuzzy
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-"        -i                - affiche les informations relatives à un package"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "        -a                - interroge l'ensemble des packages"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "        -a                - interroge l'ensemble des packages"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr "        -l                - affiche la liste des packages"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr "        -l                - affiche la liste des packages"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "        -l                - affiche la liste des packages"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Utilisez de préférence -e ou --erase.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Options de spécification de package:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Options de sélection d'information:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-"        -f <file>+        - interroge le package à qui appartient <file>"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "    -i <packagefile>\t- installe le package"
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Utilisez de préférence -e ou --erase.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
@@ -1682,15 +1713,15 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "aucun package n'a été spécifié pour la reconstruction"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 #, fuzzy
 msgid "no tar files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
@@ -2951,122 +2982,156 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "\t\t\t  p - prépare (extrait le source et applique les patches)"
+
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-#, fuzzy
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "\t\t\t  p - prépare (extrait le source et applique les patches)"
+
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
 msgstr ""
+"        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:155
+#, fuzzy
+msgid "build source and binary packages from <tarball>"
 msgstr ""
+"        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
 msgstr ""
+"        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
 msgstr ""
+"        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "\t\t\t  b - package binaire (prépare, compile, installe, package)"
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "aucun package n'a été spécifié pour l'installation"
+
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
@@ -3084,9 +3149,13 @@ msgid "query a spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
 #, fuzzy
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
@@ -3099,54 +3168,56 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr ""
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "aucun package n'a été spécifié pour la désinstallation"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr ""
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all configuration files"
 msgstr ""
 "        -c                - donne uniquement la liste des fichiers de "
 "configuration (implique -l)"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr ""
 "        -d                - donne uniquement la liste des fichiers de "
 "documentation (implique -l)"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "dump basic file information"
 msgstr ""
 "        -i                - affiche les informations relatives à un package"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 #, fuzzy
 msgid "list files in package"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "use the following query format"
 msgstr "source de requête inattendue"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "        -l                - affiche la liste des packages"
@@ -4017,24 +4088,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
@@ -4244,6 +4319,55 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr ""
+#~ "        -i                - affiche les informations relatives à un package"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "        -a                - interroge l'ensemble des packages"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "        -a                - interroge l'ensemble des packages"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr "        -l                - affiche la liste des packages"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr "        -l                - affiche la liste des packages"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "        -l                - affiche la liste des packages"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "    -i <packagefile>\t- installe le package"
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
+
+#, fuzzy
 #~ msgid "   --rcfile <file>        "
 #~ msgstr "    -i <packagefile>\t- installe le package"
 
diff --git a/po/gl.po b/po/gl.po
index a7349a907..48735c064 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index a7349a907..48735c064 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/id.po b/po/id.po
index a7349a907..48735c064 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/is.po b/po/is.po
index ff352bf9e..936d6320e 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-08-02 13:00+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -23,64 +23,64 @@ msgstr "gat ekki útbúið pakkaskilyrði:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Get ekki opnað spec skrána %s: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Gat ekki opnað pípu í tar: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Gat ekki lesið spec skrá frá %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Gat ekki endurnefnt %s sem %s: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "gat ekki búið til %s: %s\n"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Skráin er ekki venjuleg skrá: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Skráin %s virðist ekki vera specskrá.\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Þýði fyrir markkerfi: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Þýði fyrir markkerfi %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM útgáfa %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Höfundarréttur (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Þessu má dreyfa frjálst samkvæmt skilmálum GNU GPL"
@@ -103,12 +103,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <mappa>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -118,35 +118,35 @@ msgid ""
 msgstr ""
 "                        [--rcfile <skrá>] [--ignorearch] [--dbpath <mappa>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <mappa>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 "                        [--ftpproxy <þjónn>] [--ftpport <gátt>] [--justdb]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <þjónn>] [--httpport <gátt>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate slóð=nýslóð]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <slóð>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] skrá1.rpm ... skráN.rpm"
 
@@ -156,7 +156,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <mappa>] [--noscripts]"
 
@@ -166,7 +166,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <skrá>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -177,22 +177,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <þjónn>] [--httpport <gátt>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <slóð>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        skrá1.rpm ... skráN.rpm"
 
@@ -204,21 +204,21 @@ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <mappa>] [--rcfile <skrá>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 "                        [--triggeredby] [--ftpport] [--ftpproxy <þjónn>]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <gátt>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <mappa>] [targets]"
 
@@ -226,14 +226,14 @@ msgstr "                        [--changelog] [--dbpath <mappa>] [targets]"
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <mappa>] [--rcfile <skrá>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <mappa>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
@@ -254,11 +254,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <mappa>] [--noscripts] [--rcfile <skrá>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <mappa>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] pakki1 ... pakkiN"
 
@@ -276,7 +276,7 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <skrá>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           pakki1 ... pakkiN"
 
@@ -288,15 +288,15 @@ msgstr "       rpm {--rebuilddb} [--rcfile <skrá>] [--dbpath <mappa>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "prenta þessi skilaboð"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "prenta útgáfunúmer rpm sem verið er að nota"
 
@@ -308,7 +308,7 @@ msgstr "   Allir hamir styðja eftirtalin viðföng:"
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<nafn> <gildi>'"
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr "skilgreina fjölva <nafn> með gildinu <gildi>"
 
@@ -324,7 +324,7 @@ msgstr "prenta útvíkkun fjölva <nafn> á staðalfrálag"
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <skipun>       "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "senda frálag í <skipun>"
 
@@ -336,15 +336,15 @@ msgstr "    --rcfile <skrá>       "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "nota <skrá> í stað /etc/rpmrc og $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr "sýna endanlega rpmrc og stillingar fjölva"
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "vera aðeins ítarlegri"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "vera hrikalega ítarlegur (fyrir aflúsun)"
 
@@ -360,7 +360,7 @@ msgstr "   í stað skráarnafna ásamt eftirfarandi rofum:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <þjónn>  "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "vélarheiti eða IP vistfang ftp sels"
 
@@ -368,7 +368,7 @@ msgstr "vélarheiti eða IP vistfang ftp sels"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <gátt>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "gátt ftp þjónsins eða selsins"
 
@@ -376,7 +376,7 @@ msgstr "gátt ftp þjónsins eða selsins"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <þjónn> "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "vélarheiti eða IP vistfang vefsels"
 
@@ -384,11 +384,11 @@ msgstr "vélarheiti eða IP vistfang vefsels"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <gátt>   "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "gátt vefþjónsins eða vefselsins"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "fyrirspurnarhamur"
 
@@ -396,7 +396,7 @@ msgstr "fyrirspurnarhamur"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <mappa>    "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -404,7 +404,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -412,7 +412,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr "      --root <mappa>      "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -468,31 +468,31 @@ msgstr "fyrirspurn á pakkana sem þarfnast <cap> eiginleika"
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -514,25 +514,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -544,7 +545,7 @@ msgstr "    --install <pakkaskrá>"
 msgid "    -i <packagefile>      "
 msgstr "    -i <pakkaskrá>        "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "setja inn pakka"
 
@@ -560,11 +561,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <gömulslóð>=<nýslóð>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -572,47 +573,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <mappa>    "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -620,23 +621,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -648,11 +649,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -662,17 +663,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -684,52 +685,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -737,7 +738,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -745,11 +746,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -765,7 +766,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -775,7 +776,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -783,7 +784,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -791,7 +792,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -803,19 +804,19 @@ msgstr "    --checksig <pakki>+"
 msgid "    -K <pkg>+             "
 msgstr "    -K <pakki>+           "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -827,50 +828,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -878,105 +879,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -988,115 +989,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1118,144 +1119,220 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "    --define '<nafn> <gildi>'"
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "prenta útvíkkun fjölva <nafn> á staðalfrálag"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <pakkaskrá>+ "
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "      --relocate <gömulslóð>=<nýslóð>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "fyrirspurn á alla pakka"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <skrá>] [--dbpath <mappa>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <skrá>] [--ignorearch] [--dbpath <mappa>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <skrá>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <mappa>] [--noscripts] [--rcfile <skrá>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr "                        [--scripts] [--root <mappa>] [--rcfile <skrá>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <mappa>] [--rcfile <skrá>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=kerfi1[,kerfi2...]]"
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] [--rmspec] specskrá"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "                        [--rmsource] [--rmspec] specskrá"
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1263,265 +1340,225 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <skrá>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    --eval '<nafn>+'      "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "prenta útvíkkun fjölva <nafn> á staðalfrálag"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "    --rcfile <skrá>       "
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr "     -f <skrá>+           "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr "    -p <pakkaskrá>+       "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr "   -K <pakki>+           "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "    --rcfile <skrá>       "
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2772,108 +2809,137 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+#, fuzzy
+msgid "build binary package only from <specfile>"
+msgstr "fyrirspurn á pakkann sem á <skrá>"
+
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
-msgstr ""
+#, fuzzy
+msgid "query/verify package(s) owning file"
+msgstr "fyrirspurn á pakkann sem á <skrá>"
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2888,8 +2954,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2901,42 +2971,44 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr ""
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "fyrirspurn á pakkana sem þarfnast <cap> eiginleika"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr ""
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "fyrirspurn á pakkana sem veita <cap> eiginleika"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3796,24 +3868,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
@@ -4021,5 +4097,15 @@ msgstr "gat ekki opnað %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "gat ekki búið til %s: %s\n"
 
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=kerfi1[,kerfi2...]]"
+
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] [--rmspec] specskrá"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "                        [--rmsource] [--rmspec] specskrá"
+
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "innvær villa (í rpm?): "
diff --git a/po/it.po b/po/it.po
index a7349a907..48735c064 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 24e8e4496..760d2bfe9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -29,44 +29,44 @@ msgstr "°Í¸À­¤Î·çÇ¡:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "spec ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "tar ¥Ñ¥¤¥×¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "%s ¤«¤é spec ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "stat %s ¤Ë¼ºÇÔ: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï ¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
@@ -88,18 +88,18 @@ msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.135 2000/12/30 19:01:25 jbj Exp $
-#: rpm.c:185 rpmqv.c:269
+# $Id: ja.po,v 1.136 2001/01/01 23:14:48 jbj Exp $
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ¥Ð¡¼¥¸¥ç¥ó %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
@@ -107,7 +107,7 @@ msgstr ""
 "ËÝÌõ¼Ô ¿ÀÅÄ ½¼ <kanda@nn.iij4u.or.jp>\n"
 "¸íÌõÅù¤Ï¿ÀÅĤޤÇ"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "GNU°ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Î²¼¤Ç¼«Í³¤ËÇÛÉۤǤ­¤Þ¤¹"
@@ -130,11 +130,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -143,30 +143,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -175,7 +175,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -184,7 +184,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -193,20 +193,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -218,19 +218,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -238,12 +238,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -263,11 +263,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -284,7 +284,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -296,16 +296,16 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "»ÈÍÑË¡:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
 
@@ -318,7 +318,7 @@ msgstr "   °Ê²¼¤Î°ú¿ô¤Ï¤¹¤Ù¤Æ¤Î¥â¡¼¥É¤Ç»ÈÍѤǤ­¤Þ¤¹:"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -335,7 +335,7 @@ msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "ɸ½à½ÐÎϤò <cmd> ¤Ø¥Ñ¥¤¥×¤·¤Þ¤¹"
 
@@ -347,15 +347,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "/etc/rpmrc ¤È $HOME/.rpmrc ¤ÎÂå¤ê¤Ë <file> ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "¤â¤¦¾¯¤·¾ðÊóɽ¼¨¤òÁý¤ä¤·¤Þ¤¹"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "½½Ê¬¤Ë¾ðÊóɽ¼¨¤òÁý¤ä¤·¤Þ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)"
 
@@ -372,7 +372,7 @@ msgstr "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢Ì䤤¹ç¤ï¤»¤·¤Þ¤¹:"
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "ftp ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
 
@@ -380,7 +380,7 @@ msgstr "ftp ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp (¤â¤·¤¯¤Ï¥×¥í¥­¥·)¥µ¡¼¥Ð¤Î¥Ý¡¼¥ÈÈÖ¹æ"
 
@@ -388,7 +388,7 @@ msgstr "ftp (¤â¤·¤¯¤Ï¥×¥í¥­¥·)¥µ¡¼¥Ð¤Î¥Ý¡¼¥ÈÈÖ¹æ"
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "http ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
@@ -397,12 +397,12 @@ msgstr "http ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "http (¤â¤·¤¯¤Ï¥×¥í¥­¥·)¥µ¡¼¥Ð¤Î¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
 
@@ -410,7 +410,7 @@ msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤΥǥ£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤òÍѤ¤¤Þ¤¹"
 
@@ -418,7 +418,7 @@ msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤΥǥ£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤òÍѤ¤¤Þ¤¹"
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "¥Ø¥Ã¥À¥Õ¥©¡¼¥Þ¥Ã¥È¤È¤·¤Æ <qfmt> ¤ò»ÈÍѤ·¤Þ¤¹ (-i ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
@@ -427,7 +427,7 @@ msgstr "¥Ø¥Ã¥À¥Õ¥©¡¼¥Þ¥Ã¥È¤È¤·¤Æ <qfmt> ¤ò»ÈÍѤ·¤Þ¤¹ (-i ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Þ¤¹"
 
@@ -487,33 +487,33 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr "      ¾ðÊóÁªÂò¥ª¥×¥·¥ç¥ó:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÊѹ¹ÍúÎò¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹(-l ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ëʸ½ñ¥Õ¥¡¥¤¥ë¤Î¤ß¤Î¾õÂÖ¤òɽ¼¨¤·\n"
 "\t\t\t     ¤Þ¤¹(-l ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Î¤ß¤òɽ¼¨¤·¤Þ¤¹(-l ¤ÎƯ¤­¤ò´Þ¤ß¤Þ¤¹)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -539,7 +539,7 @@ msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Þ\n"
 "\t\t\t       ¤¹"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -547,19 +547,20 @@ msgstr ""
 "-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
 "¥¤¥ó¥¹¥È¡¼¥ë¤Î¾õ¶·¤ò¸¡¾Ú¤·¤Þ¤¹"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "¥Õ¥¡¥¤¥ë¤Î md5 ¥Á¥§¥Ã¥¯¥µ¥à¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "¥Õ¥¡¥¤¥ë°À­¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 "Ì䤤¹ç¤ï¤»¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤ËÍѤ¤¤é¤ìÆÀ¤ë¥¿¥°¤ò\n"
@@ -573,7 +574,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
 
@@ -590,11 +591,11 @@ msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)"
@@ -603,51 +604,51 @@ msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)"
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "ºÆÇÛÃÖ²Äǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ñ¥¹\n"
 "ÀÜƬ¼­¤ò <dir> ¤ËÀßÄꤷ¤Þ¤¹"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤»¤ó"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs ¤È --replacefiles ¤òû½Ì¤·¤¿¤â¤Î"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '#' ¤Çɽ¼¨¤·¤Þ¤¹(-v ¤ò»ÈÍѤ¹¤ë¤ÈÎɤ¤)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "ÀßÄê¤ò¥¹¥­¥Ã¥×¤·¡¢Á´¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÂоݥ¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë¥Ç¥£¥¹¥¯¤ÎÍÆÎÌ¥Á¥§¥Ã¥¯¤ò¤·¤Þ¤»¤ó"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ÂоÝOS¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Þ¤¹¤¬¡¢\n"
 "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÊѹ¹¤·¤Þ¤»¤ó"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "°Í¸À­¤òËþ¤¿¤¹¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î\n"
@@ -657,27 +658,27 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
 "¼Â¹Ô¤·¤Þ¤»¤ó"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¤Ë '%' ¤Çɽ¼¨¤·¤Þ¤¹"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 "¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤¬\n"
 "¤¢¤Ã¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "´û¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¹Ô¤¤¤Þ¤¹"
 
@@ -689,13 +690,13 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹(--install "
 "¤È´ö¤Ä¤«¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±Â­¤·¤¿¤â¤Î)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -707,11 +708,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü(¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë)¤·¤Þ¤¹"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -719,7 +720,7 @@ msgstr ""
 "<package> ¤È°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸Á´¤Æ¤òºï½ü¤·¤Þ¤¹(°ìÈÌ\n"
 "\t\t\t      Ū¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤹ¤ë¤È¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
 
@@ -731,54 +732,54 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤·¤Þ¤¹¡¢<stage> ¤Ï°Ê²¼¤Î¤¦¤Á¤Ò¤È¤Ä¤Ç¤¹:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (¥½¡¼¥¹¤òŸ³«¤·¥Ñ¥Ã¥Á¤òÅö¤Æ¤Þ¤¹)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "¥ê¥¹¥È¸¡ºº (%files ¥»¥¯¥·¥ç¥ó¤ÎÂç¤Þ¤«¤Ê¥Á¥§¥Ã¥¯)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "¥³¥ó¥Ñ¥¤¥ë (prep¡¢compile)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë (prep¡¢compile¡¢install)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "¥Ð¥¤¥Ê¥ê¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "¥Ð¥¤¥Ê¥ê/¥½¡¼¥¹¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "»ØÄꤷ¤¿²áÄø¤Þ¤Ç¥¹¥­¥Ã¥×¤·¤Þ¤¹ (c¡¢i ¤Ç¤Î¤ßÍ­¸ú)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¸åºîÀ®¥Ä¥ê¡¼¤òºï½ü¤·¤Þ¤¹"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "½ªÎ»¸å¥½¡¼¥¹¤òºï½ü¤·¤Þ¤¹"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "½ªÎ»¸å¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹"
@@ -787,7 +788,7 @@ msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹"
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "BuildRoot ¤È¤·¤Æ <dir> ¤òÍѤ¤¤Þ¤¹"
 
@@ -795,11 +796,11 @@ msgstr "BuildRoot ¤È¤·¤Æ <dir> ¤òÍѤ¤¤Þ¤¹"
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
 
@@ -815,7 +816,7 @@ msgstr "¥¿¥¤¥à¥Á¥§¥Ã¥¯´ü¸Â¤òÀßÄꤷ¤Þ¤¹(0¤Ç̵¸ú)"
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -828,7 +829,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "--rebuild ¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤·¤Þ¤»¤ó"
 
@@ -836,7 +837,7 @@ msgstr "--rebuild ¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤·¤Þ¤»¤ó"
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
 
@@ -844,7 +845,7 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤òÄɲä·¤Þ¤¹"
 
@@ -856,20 +857,20 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "½ð̾¤Î¸¡¾Ú¤ò¤·¤Þ¤¹"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "PGP ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "GPG ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "MD5 ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
@@ -881,7 +882,7 @@ msgstr "Í­¸ú¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Â¸ºß¤¹¤ë¤³¤È¤ò³Î¤«¤á¤Þ¤¹"
 msgid "rebuild database from existing database"
 msgstr "´û¸¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -889,7 +890,7 @@ msgstr ""
 "-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
 "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Îµö²Ä°À­¤ËÀßÄꤷ¤Þ¤¹"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -898,38 +899,38 @@ msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î½êÍ­¼Ô¤È¥°¥ë¡¼¥×¤ËÀßÄꤷ¤Þ¤¹"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "°ì¤Ä¤Î¥á¥¸¥ã¡¼¥â¡¼¥É¤Î¤ß¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ¤È --uninstall ¤Ï¤â¤Ï¤äÆ°ºî¤·¤Þ¤»¤ó\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "ºÆÇÛÃÖ¤Ï / ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "ºÆÇÛÃÖ¤Ï = ¤ò´Þ¤ó¤Ç¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "ºÆÇÛÃÖ¤Ï = ¤Î¼¡¤Ë / ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "½ü³°¤¹¤ë¥Ñ¥¹¤Ï / ¤«¤é»Ï¤Þ¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -937,45 +938,45 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, fuzzy, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "°ú¿ô½èÍý(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "Ì䤤¹ç¤ï¤»/¸¡¾Ú¤Ï°ìÅ٤˰ì¤Ä¤·¤«¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥é¥°"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥©¡¼¥Þ¥Ã¥È"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥½¡¼¥¹"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢¥½¡¼¥¹ºï½ü¡¢¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ëºï½ü»þ¤Î¤ß¶¯À©¤Ç¤­¤"
 "Þ¤¹"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ßºÆÇÛÃ֤Ǥ­¤Þ¤¹"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
@@ -983,68 +984,68 @@ msgstr ""
 "--relocate ¤È --excludepath "
 "¤Ï¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix ¤Ï¿·µ¬¤Ë¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ¤Ø¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ¤È --includedocs ¤Ï¤É¤Á¤é¤«°ìÊý¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "-ignoreos ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "-ignoresize ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1056,7 +1057,7 @@ msgid ""
 "verification"
 msgstr "--notriggers ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1064,13 +1065,13 @@ msgid ""
 msgstr ""
 "--nodeps ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ÎºîÀ®¡¢¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢ºîÀ®»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1078,101 +1079,101 @@ msgstr ""
 "--root (-r) "
 "¤Ï¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢Ì䤤¹ç¤ï¤»¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹ºÆ¹½ÃÛ»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Þ¤é¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage ¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp ¤Ï½ð̾¸¡ºº»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg ¤Ï½ð̾¸¡ºº»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 ¤Ï½ð̾¸¡ºº¤È¥Ñ¥Ã¥±¡¼¥¸¸¡¾Ú»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr "½ð̾¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 #, fuzzy
 msgid "pgp not found: "
 msgstr "pgp ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÀµ¾ï¤Ç¤¹¡¥\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr "¼Â¹Ô¼ºÇÔ\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "½ð̾¸¡ºº¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "½ð̾¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¤ÎÌ䤤¹ç¤ï¤»¤Î¤¿¤á¤Ë;ʬ¤Ê°ú¿ô¤¬¤¢¤ê¤Þ¤¹"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¤Î¸¡¾Ú¤Î¤¿¤á¤Ë;ʬ¤Ê°ú¿ô¤¬¤¢¤ê¤Þ¤¹"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
@@ -1196,436 +1197,475 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤«¤é¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤Î¥¨¥é¡¼\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "´û¸¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+#, fuzzy
+msgid "skip files with leading component <path> "
+msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
+"¼Â¹Ô¤·¤Þ¤»¤ó"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+#, fuzzy
+msgid "Signature options:"
+msgstr "½ð̾¥µ¥¤¥º: %d\n"
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "»ÈÍÑË¡: rpm {--help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   °Ê²¼¤Î°ú¿ô¤Ï¤¹¤Ù¤Æ¤Î¥â¡¼¥É¤Ç»ÈÍѤǤ­¤Þ¤¹:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr "¥Õ¥¡¥¤¥ë̾¤È°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ÎÂå¤ê¤Ë ftp URL ¤ò»È¤¨¤ë¤è¤¦(-p ¤òÍѤ¤¤Æ)"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢Ì䤤¹ç¤ï¤»¤·¤Þ¤¹:"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      ¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "<file> ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 "(̤¥¤¥ó¥¹¥È¡¼¥ë)¥Ñ¥Ã¥±¡¼¥¸ <packagefile> ¤ò\n"
 "Ì䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "<cap> ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 "<cap> ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
 "Ì䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      ¾ðÊóÁªÂò¥ª¥×¥·¥ç¥ó:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "[¥¢¥ó]¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Þ¤¹"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Þ¤Þ¤ì¤ë¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Þ\n"
 "\t\t\t       ¤¹"
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-#, fuzzy
-msgid "skip files with leading component <path> "
-msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤»¤ó"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-"¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
-"¼Â¹Ô¤·¤Þ¤»¤ó"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Þ¤¹"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë̾Á°¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "´û¸¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤ·¤Ê¤¤¤Î¤Ë --dbpath ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤¹"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»þ¤Î¤ß»ØÄê¤Ç¤­¤Þ¤¹"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
@@ -2902,121 +2942,153 @@ msgid ""
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr "¥Ó¥ë¥É¥ë¡¼¥È¤Ï¤¹¤Ç¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "prep (¥½¡¼¥¹¤òŸ³«¤·¥Ñ¥Ã¥Á¤òÅö¤Æ¤Þ¤¹)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹\n"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤­´¹¤¨¤Þ¤¹"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "prep (¥½¡¼¥¹¤òŸ³«¤·¥Ñ¥Ã¥Á¤òÅö¤Æ¤Þ¤¹)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤­´¹¤¨¤Þ¤¹"
+
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
-msgstr ""
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
+msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "¥Ð¥¤¥Ê¥ê¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid "<source package>"
+msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
+
+#: lib/poptBT.c:168
+#, fuzzy
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 #, fuzzy
 msgid "override build root"
 msgstr "¥Ó¥ë¥É¥ë¡¼¥È¤ò¾å½ñ¤­¤·¤Þ¤¹"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "ºîÀ®¤¹¤ë¤¿¤á¤Î¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:187
+#, fuzzy
+msgid "do not accept i18N msgstr's from specfile"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤«¤é I18N ¤Ê msgstr ¤ò¼õ¤±Æþ¤ì¤Þ¤»¤ó"
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "½ªÎ»¸å¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr "¥¿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ò¾å½ñ¤­¤·¤Þ¤¹"
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+#, fuzzy
+msgid "lookup i18N strings in specfile catalog"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¥«¥¿¥í¥°Ãæ¤Î I18N ʸ»úÎó¤òõ¤·¤Æ¤¤¤Þ¤¹"
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "<file> ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "¥°¥ë¡¼¥×Ãæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹\n"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
 #: lib/poptQV.c:76
@@ -3033,9 +3105,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
 #, fuzzy
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
 #: lib/poptQV.c:86
@@ -3050,50 +3126,50 @@ msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
 
 #: lib/poptQV.c:90
 #, fuzzy
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
-"µ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
+"<cap> ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
 "Ì䤤¹ç¤ï¤»¤Þ¤¹"
 
 #: lib/poptQV.c:92
 #, fuzzy
-msgid "query the packages which provide a capability"
-msgstr "µ¡Ç½¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "<cap> ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Á´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Á´¤Æ¤Î¥É¥­¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "dump basic file information"
 msgstr "´ðËÜŪ¤Ê¥Õ¥¡¥¤¥ë¾ðÊó¤ò¥À¥ó¥×¤·¤Þ¤¹"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 #, fuzzy
 msgid "list files in package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Þ¤¹\n"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr "°Ê²¼¤ÎÌ䤤¹ç¤ï¤»¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤­´¹¤¨¤Þ¤¹"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹"
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Þ¤¹"
@@ -3982,29 +4058,34 @@ msgstr "¥Ý¥¹¥È¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Þ¤»¤ó"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Þ¤»¤ó"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ï ¥æ¡¼¥¶Ì¾¤È id "
 "¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê¤é¤Ê¤¤)"
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥°¥ë¡¼¥×̾¤È id "
 "¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê¤é¤Ê¤¤)"
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:"
@@ -4223,6 +4304,20 @@ msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë̾Á°¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "query the packages which require a capability"
+#~ msgstr ""
+#~ "µ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
+#~ "Ì䤤¹ç¤ï¤»¤Þ¤¹"
+
+#, fuzzy
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "µ¡Ç½¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Þ¤¹"
+
 #~ msgid "exec failed!\n"
 #~ msgstr "¼Â¹Ô¼ºÇÔ!\n"
 
diff --git a/po/ko.po b/po/ko.po
index a7349a907..48735c064 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 516560c2f..2ea9282ab 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-08-17 20:22+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -23,64 +23,64 @@ msgstr "feil med avhengigheter under bygging:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Kunne ikke åpne tar rør: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Feil under lesing av spec fil fra %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Feil under endring av navn fra %s til %s: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Filen er ikke en vanlig fil: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Fil %s ser ikke ut til å være en spec fil.\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger målplattformene: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger for mål %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versjon %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright © 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
@@ -104,12 +104,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <katalog>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -119,34 +119,34 @@ msgid ""
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <katalog>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <katalog>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <vert>] [--ftpport <port>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <vert>] [--httpport <port>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate oldpath=nysti]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <sti>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] fil1.rpm ... filN.rpm"
 
@@ -156,7 +156,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <katalog>] [--noscripts]"
@@ -167,7 +167,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -178,22 +178,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <vert>] [--httpport <port>] "
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate oldpath=nysti]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <sti>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        fil1.rpm ... filN.rpm"
 
@@ -206,19 +206,19 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <katalog>] [mål]"
 
@@ -227,14 +227,14 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <katalog>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [mål]"
 
@@ -255,11 +255,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <katalog>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] pakke1 ... pakkeN"
 
@@ -277,7 +277,7 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           pakke1 ... pakkeN"
 
@@ -289,15 +289,15 @@ msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "skriv ut denne meldingen"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "skriv ut hvilken versjon av rpm som brukes"
 
@@ -309,7 +309,7 @@ msgstr "   Alle modi støtter følgende argumenter:"
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<navn> <kropp>'"
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr "definér makro <navn> med verdi <kropp>"
 
@@ -325,7 +325,7 @@ msgstr "skriv ut utvidelsen av makro <navn> til stdout"
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <kmd>          "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "send stdout til <kmd>"
 
@@ -337,15 +337,15 @@ msgstr "    --rcfile <fil>        "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "bruk <fil> i stedet for /etc/rpmrc og $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr "vis endelig rpmrc og makrokonfigurasjon"
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "gi litt mer informasjon"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "skriv ut mye informasjon (for feilsøking)"
 
@@ -362,7 +362,7 @@ msgstr "   for filnavn i tillegg til følgende alternativer:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <vert>   "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "vertsnavn eller IP for ftp proxy"
 
@@ -370,7 +370,7 @@ msgstr "vertsnavn eller IP for ftp proxy"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <vert>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "portnummer for ftp tjener (eller proxy)"
 
@@ -378,7 +378,7 @@ msgstr "portnummer for ftp tjener (eller proxy)"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <vert>  "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "vertsnavn eller IP for http proxy"
 
@@ -386,11 +386,11 @@ msgstr "vertsnavn eller IP for http proxy"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "portnummer for http tjener (eller proxy)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "spørringsmodus"
 
@@ -398,7 +398,7 @@ msgstr "spørringsmodus"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <katalog>  "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "bruk <katalog> som katalog for databasen"
 
@@ -406,7 +406,7 @@ msgstr "bruk <katalog> som katalog for databasen"
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <spfmt>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "bruk <spfmt> som headerformat (impliserer --info)"
 
@@ -414,7 +414,7 @@ msgstr "bruk <spfmt> som headerformat (impliserer --info)"
 msgid "      --root <dir>        "
 msgstr "      --root <katalog>    "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "bruk <katalog> som toppnivåkatalog"
 
@@ -470,31 +470,31 @@ msgstr "spør etter etter pakker som trenger <funk> funksjonalitet"
 msgid "      Information selection options:"
 msgstr "      Alternativer for informasjonsvalg:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "vis pakkeinformasjon"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "vis pakkens endringslogg"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "vis pakkens filliste"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "vis filtilstander (impliserer -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "list kun dokumentasjonsfiler (impliserer -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "vis kun konfigurasjonfiler (impliserer -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -517,7 +517,7 @@ msgstr "skriv ut de forskjellige [av]installasjonsskriptene"
 msgid "show the trigger scripts contained in the package"
 msgstr "vis utløserskriptene som finnes i pakken"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -525,19 +525,20 @@ msgstr ""
 "verifisér en pakkeinstallasjon ved å bruke samme alternativer for "
 "pakkespesifikasjon som -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "ikke verifiser filens md5 sjekksum"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "ikke verifiser filattributter"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "list tags som kan brukes i et spørringsformat"
 
@@ -549,7 +550,7 @@ msgstr "    --install <pakkefil>"
 msgid "    -i <packagefile>      "
 msgstr "    -i <pakkefil>         "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "installér pakke"
 
@@ -565,11 +566,11 @@ msgstr "hopp over filer i sti <sti>"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <gmlsti>=<nysti>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "omplassér filer fra <gmlsti> til <nysti>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr "omplassér filer i ikke-omplasserbar pakke"
 
@@ -577,47 +578,47 @@ msgstr "omplassér filer i ikke-omplasserbar pakke"
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <kat>"
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "omplassér pakken til <kat>, hvis den er omplasserbar"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "ikke installer dokumentasjon"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "forkortning for --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "installér alle filer, selv konfigurasjoner som ellers kan hoppes over"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "ikke sjekk diskplass før installasjon"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "ikke verifiser operativsystem for pakken"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "installér dokumentasjon"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "oppdatér databasen, men ikke modifiser filsystemet"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ikke ordne pakkeinstallasjon for å tilfredsstille avhengigheter"
 
@@ -625,23 +626,23 @@ msgstr "ikke ordne pakkeinstallasjon for å tilfredsstille avhengigheter"
 msgid "don't execute any installation scripts"
 msgstr "ikke kjør noen installasjonsskript"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr "ikke kjør skript som utløses av denne pakken"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "installér selv om pakken erstatter installerte filer"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "reinstallér selv om pakken allerede er installert"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "ikke installér, men si ifra om det ville virke eller ikke"
 
@@ -653,11 +654,11 @@ msgstr "    --upgrade <pakkefil>"
 msgid "    -U <packagefile>      "
 msgstr "    -U <pakkefil>"
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "oppgradér pakke (samme alternativ som --install, plus)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -669,11 +670,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <pakke>"
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "slett (avinstallér) pakke"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -681,7 +682,7 @@ msgstr ""
 "fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis "
 "<pakke> spesifiserer flere pakker)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "ikke kjør noen pakkespesifikke skript"
 
@@ -693,52 +694,52 @@ msgstr "    -b<stadium> <spec>    "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<stadium> <tarball> "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "bygg pakke, hvor <steg> er ett av:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (pakk ut kildekoden og legg til patcher)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "listesjekk (utfør noen kontroller på %filer)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompilér (prep og kompilér)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "installér (prep, kompilér, installér)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "binær pakke (prep, kompilér, installér, pakk)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src pakke (prep, kompilér, installér, pakk)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "hopp rett til spesifisert steg (kun for c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "fjern byggtréet når ferdig"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr "fjern kildekoden når ferdig"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr "fjern specfilen når ferdig"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr "generér PGP/GPG signatur"
 
@@ -746,7 +747,7 @@ msgstr "generér PGP/GPG signatur"
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <kat>   "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "bruk <katalog> som byggrot"
 
@@ -754,11 +755,11 @@ msgstr "bruk <katalog> som byggrot"
 msgid "      --target=<platform>+"
 msgstr "      --target=<plattform>+"
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "bygg pakkene for mål plattform1...plattformN."
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "ikke kjør noen steg"
 
@@ -774,7 +775,7 @@ msgstr "sett tidssjekk til <sek> sekunder (0 slår av)"
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <kilde_pakke>"
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -786,7 +787,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <kilde_pakke>"
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "som --rebuild, men ikke bygg noen pakke"
 
@@ -794,7 +795,7 @@ msgstr "som --rebuild, men ikke bygg noen pakke"
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pakke>+     "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "signér en pakke (forkast nåværende signatur)"
 
@@ -802,7 +803,7 @@ msgstr "signér en pakke (forkast nåværende signatur)"
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pakke>+    "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "legg til signatur til en pakke"
 
@@ -814,19 +815,19 @@ msgstr "    --checksig <pakke>+"
 msgid "    -K <pkg>+             "
 msgstr "    -K <pkg>+             "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "verifisér pakkesignatur"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "hopp over PGP-signaturer"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr "hopp over GPG-signaturer"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "hopp over MD5-signaturer"
 
@@ -838,7 +839,7 @@ msgstr "sjekk at en gyldig database eksisterer"
 msgid "rebuild database from existing database"
 msgstr "bygg opp igjen databasen fra den eksisterende databasen"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -846,7 +847,7 @@ msgstr ""
 "sett filrettigheter til de samme som i pakkedatabasen ved å bruke samme "
 "alternativer for pakkespesifikasjon som med -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -855,37 +856,37 @@ msgstr ""
 "alternativer for pakkespesifikasjon som -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "kun ett større modi kan spesifiseres"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u og --uninstall er utgått og virker ikke lengre.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Bruk -e eller --erase i stedet.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "relokasjoner må begynne med en /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "relokasjoner må inneholde et ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "relokasjoner må ha et / etter ="
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr "eksluderingssti må begynne med en /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -893,106 +894,106 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "én type spørring/verifisering kan utføres om gangen"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr "uventede flagg for spørring"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr "ventet spørringsformat"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "uventet spørringskilde"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "kune en av --prefix eller --relocate kan brukes"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenter til --prefix må begynne med en /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1004,115 +1005,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1134,146 +1135,225 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "    --define '<navn> <kropp>'"
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "skriv ut utvidelsen av makro <navn> til stdout"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "    --erase <pakke>"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "pakke %s kan ikke relokeres\n"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <pakkefil>+ "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "ikke kjør noen steg"
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "      --relocate <gmlsti>=<nysti>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "    --upgrade <pakkefil>"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <katalog>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=plattform1[,plattform2...]]"
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] [--rmspec] specfil"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "                        [--rmsource] [--rmspec] specfil"
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1281,266 +1361,225 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    --eval '<navn>+'      "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "skriv ut utvidelsen av makro <navn> til stdout"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Bruk -e eller --erase i stedet.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr "     -f <fil>+            "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr "     -p <pakkefil>+       "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <pakke>"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr "spør/verifisér pakker utløst av <pakke>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "ikke kjør noen steg"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Bruk -e eller --erase i stedet.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2791,109 +2830,143 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "prep (pakk ut kildekoden og legg til patcher)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
-msgstr ""
+#: lib/poptBT.c:133
+#, fuzzy
+msgid "build source and binary packages from <specfile>"
+msgstr "fant %d kilde- og %d binærpakker\n"
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
-msgstr ""
+#: lib/poptBT.c:136
+#, fuzzy
+msgid "build binary package only from <specfile>"
+msgstr "spør pakke som eier <fil>"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "prep (pakk ut kildekoden og legg til patcher)"
+
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:155
+#, fuzzy
+msgid "build source and binary packages from <tarball>"
+msgstr "fant %d kilde- og %d binærpakker\n"
+
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+#, fuzzy
+msgid "build binary package from <source package>"
+msgstr "binær pakke (prep, kompilér, installér, pakk)"
+
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
-msgstr ""
+#, fuzzy
+msgid "query/verify package(s) owning file"
+msgstr "spør pakke som eier <fil>"
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
-msgstr ""
+#, fuzzy
+msgid "query/verify package(s) in group"
+msgstr "spør/verifisér pakker utløst av <pakke>"
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
-msgstr ""
+#, fuzzy
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgstr "spør/verifisér pakker utløst av <pakke>"
 
 #: lib/poptQV.c:76
 msgid "rpm query mode"
@@ -2907,10 +2980,15 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+#: lib/poptQV.c:82
+msgid "<spec>"
 msgstr ""
 
+#: lib/poptQV.c:84
+#, fuzzy
+msgid "query the package(s) triggered by the package"
+msgstr "spør pakker utløst av <pakke>"
+
 #: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
@@ -2920,42 +2998,44 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr ""
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "spør etter etter pakker som trenger <funk> funksjonalitet"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr ""
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "spør etter pakker som tilbyr <funk> funksjonalitet"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3816,24 +3896,29 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "ikke kjør noen steg"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "mangler andre ':' ved %s:%d"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
@@ -4041,5 +4126,15 @@ msgstr "klarte ikke å åpne %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=plattform1[,plattform2...]]"
+
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] [--rmspec] specfil"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "                        [--rmsource] [--rmspec] specfil"
+
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "intern feil (rpm feil?): "
diff --git a/po/pl.po b/po/pl.po
index 75c6bae91..af7e7ed73 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -30,64 +30,64 @@ msgstr "niespe³nione zale¿no¶ci:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nie mo¿na otworzyæ pliku spec: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Otwarcie potoku tara nie powiod³o siê: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Odczytanie pliku spec z %s nie powiod³o siê\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Zmiana nazwy %s na %s nie powiod³a siê\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "stat nie powiod³o siê %s: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Plik: %s nie jest regularnym plikiem\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s nie wygl±da na pakiet RPM\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Budowanie dla platform: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM wersja %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Program mo¿e byæ swobodnie rozpowszechniany na warunkach licencji GNU"
@@ -111,12 +111,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <katalog>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -126,36 +126,36 @@ msgid ""
 msgstr ""
 "                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <katalog>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <port>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <host>] [--httpport <port>] "
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--noorder] [--relocate stara-¶cie¿ka=nowa-¶cie¿ka]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <¶cie¿ka>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] plik1.rpm ... plikN.rpm"
 
@@ -165,7 +165,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <katalog>] [--noscripts]"
@@ -176,7 +176,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -187,23 +187,23 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <host>] [--httpport <port>] "
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--noorder] [--relocate stara-¶cie¿ka=nowa-¶cie¿ka]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <¶cie¿ka>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        plik1.rpm ... plikN.rpm"
 
@@ -216,22 +216,22 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [cele]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <katalog>] [cele]"
 
@@ -240,14 +240,14 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <katalog>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [cele]"
 
@@ -269,11 +269,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <katalog>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] pakiet1 ... pakietN"
@@ -292,7 +292,7 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           pakiet1 ... pakietN"
 
@@ -304,16 +304,16 @@ msgstr "       rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "u¿ycie:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "wy¶wietl ten tekst"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
 
@@ -326,7 +326,7 @@ msgstr "   wszystkie tryby pracy pozwalaj± u¿yæ nastêpuj±cych argumentów:"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -344,7 +344,7 @@ msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <komenda>      "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "przeka¿ standartowe wyj¶cie do <komenda>"
 
@@ -357,15 +357,15 @@ msgstr "      --rcfile <plik>     "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "u¿yj <plik> zamiast /etc/rpmrc i $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "wy¶wietlaj nieco wiêcej komunikatów"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "wy¶wietlaj BARDZO du¿o komunikatów (dla odpluskwiania)"
 
@@ -384,7 +384,7 @@ msgstr "   nazwy pliku tak jak i nastêpuj±cych opcji:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <host>   "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "nazwa lub numer IP maszyny bêd±cej ftp proksy"
 
@@ -392,7 +392,7 @@ msgstr "nazwa lub numer IP maszyny bêd±cej ftp proksy"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "numer portu serwera ftp (lub proksy)"
 
@@ -401,7 +401,7 @@ msgstr "numer portu serwera ftp (lub proksy)"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <host>   "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "nazwa lub IP hosta bêd±cego http proksy"
 
@@ -410,11 +410,11 @@ msgstr "nazwa lub IP hosta bêd±cego http proksy"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>    "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "numer portu serwera http (albo proksy)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "tryb odpytywania"
 
@@ -422,7 +422,7 @@ msgstr "tryb odpytywania"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <katalog>      "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "u¿yj <katalog> jako katalogu bazy pakietów"
 
@@ -430,7 +430,7 @@ msgstr "u¿yj <katalog> jako katalogu bazy pakietów"
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <format zapytania>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "u¿yj <format zapytania> jako formatu nag³ówka (dotyczy -i)"
@@ -439,7 +439,7 @@ msgstr "u¿yj <format zapytania> jako formatu nag³ówka (dotyczy -i)"
 msgid "      --root <dir>        "
 msgstr "      --root <katalog>        "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu"
 
@@ -495,31 +495,31 @@ msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
 msgid "      Information selection options:"
 msgstr "      Opcje odpytuj±ce pakiety:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "wy¶wietl informacjê o pakiecie"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "wy¶wietl wykaz zmian dokonanych w pakiecie"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "wy¶wietl listê plików zawartych w pakiecie"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "poka¿ statusy plików (dotyczy -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "wy¶wietl tylko pliki dokumentacji (dotyczy -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "wy¶wietl tylko pliki konfiguracyjne (dotyczy -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -542,25 +542,26 @@ msgstr "wy¶wietl skrypty [de]instalacyjne"
 msgid "show the trigger scripts contained in the package"
 msgstr "wy¶wietl trigger skrypty zawarte w pakiecie"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "sprawd¼ stan pakietu (u¿ywa tych samych opcji co -q)"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "nie sprawdzaj zale¿no¶ci pakietu"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "nie sprawdzaj sum kontrolnych md5 plików"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "nie sprawdzaj atrybutów plików"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "wypisz etykiety w³asno¶ci, o które mo¿na zapytaæ"
 
@@ -572,7 +573,7 @@ msgstr "    --install <nazwa pakietu>"
 msgid "    -i <packagefile>      "
 msgstr "    -i <nazwa pakietu>      "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "instaluj pakiet"
 
@@ -588,11 +589,11 @@ msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "przesuñ pliki z drzewa <stara-¶cie¿ka> do drzewa <nowa-¶cie¿ka>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s"
@@ -601,49 +602,49 @@ msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s"
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>      "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "przesuñ pliki pakietu do drzewa <katalog>, je¶li jest przesuwalny"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "nie instaluj dokumentacji"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "wy¶wietlaj znaki hash przy instalacji (fajne z -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by "
 "pominêto"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "nie sprawdzaj architektury systemu"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "nie sprawdzaj zajêto¶ci dysku przed instalacj±"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "nie sprawdzaj rodzaju systemu operacyjnego"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "zainstaluj dokumentacjê"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "od¶wie¿ bazê, ale nie modyfikuj systemu plików"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nie zmieniaj kolejno¶ci instalacji pakietów by zapewniæ zale¿no¶ci"
 
@@ -651,23 +652,23 @@ msgstr "nie zmieniaj kolejno¶ci instalacji pakietów by zapewniæ zale¿no¶ci"
 msgid "don't execute any installation scripts"
 msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "wy¶wietlaj stan instalacji w procentach"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "instaluj nawet gdy pakiet zastêpuje inne zainstalowane pliki"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "przeinstaluj je¶li pakiet jest ju¿ zainstalowany"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "nie instaluj, podaj tylko czy instalacja zadzia³a czy nie"
 
@@ -679,11 +680,11 @@ msgstr "    --upgrade <nazwa pakietu>"
 msgid "    -U <packagefile>      "
 msgstr "    -U <nazwa pakietu>      "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "uaktualnij pakiet (te same opcje jak --install, plus)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -695,11 +696,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <pakiet>"
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "usuñ (odinstaluj) pakiet"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -707,7 +708,7 @@ msgstr ""
 "usuñ wszystkie pakiety, które spe³niaj± wzorzec <pakiet> (zazwyczaj "
 "wy¶wietlany jest b³±d gdy <pakiet> opisuje wiele pakietów)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
 
@@ -719,54 +720,54 @@ msgstr "    -b<etap> <plik-spec>  "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etap> <plik-tar>   "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "buduj pakiet, gdzie <etap> to:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "preparuj (rozpakuj ¼ród³a i na³ó¿ ³aty)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 "sprawdzanie z listy (wykonuje kilka podstawowych weryfikacji na %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompiluj (preparuj i kompiluj)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "instaluj (preparuj, kompiluj i instaluj)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "pakiet binarny/¼ród³owy (preparuj, kompiluj, instaluj, pakiet)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "przejd¼ od razu do podanego etapu (tylko dla c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "usuñ budowane drzewo po skoñczeniu"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr "usuñ ¼ród³a po zakoñczeniu"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "usuñ speca po zakoñczeniu"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr "generuj sygnaturê PGP/GPG"
 
@@ -774,7 +775,7 @@ msgstr "generuj sygnaturê PGP/GPG"
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <katalog>"
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "u¿yj <katalog> jako korzeñ budowanego drzewa"
 
@@ -782,11 +783,11 @@ msgstr "u¿yj <katalog> jako korzeñ budowanego drzewa"
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "buduj pakiety dla platform docelowych platforma1...platformaN."
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "nie wykonuj ¿adnych etapów"
 
@@ -802,7 +803,7 @@ msgstr "ustaw sprawdzanie czasu do ilo¶ci <sekund> (0 wy³±cza)"
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <pkt_¼ród³> "
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -814,7 +815,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <pkt_¼ród³>"
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "jak --rebuild, ale nie buduj ¿adnych pakietów"
 
@@ -822,7 +823,7 @@ msgstr "jak --rebuild, ale nie buduj ¿adnych pakietów"
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pakiet>+    "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
 
@@ -830,7 +831,7 @@ msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pakiet>+   "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "dodaj sygnaturê do pakietu"
 
@@ -844,19 +845,19 @@ msgstr "    --checksig <pakiet>+  "
 msgid "    -K <pkg>+             "
 msgstr "    --resign <pakiet>+    "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "sprawd¼ sygnaturê pakietu"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "pomiñ wszelkie sygnatury PGP"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr "pomiñ wszelkie sygnatury GPG"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "pomiñ wszelkie sygnatury MD5"
 
@@ -868,7 +869,7 @@ msgstr "upewnij siê, ¿e poprawna baza istnieje"
 msgid "rebuild database from existing database"
 msgstr "przebuduj istniej±c± bazê"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -876,7 +877,7 @@ msgstr ""
 "ustaw prawa dostêpu takie jak zapisano w bazie pakietów (u¿ywa tych samych "
 "opcji co -q)"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -885,37 +886,37 @@ msgstr ""
 "samych opcji co -q)"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "tylko jeden g³ówny tryb pracy mo¿e byæ podany"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u i --uninstall nie s± ju¿ obs³ugiwane i nie pracuj±.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "U¿yj -e lub --erase\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "drzewa przesuniêæ musz± zaczynaæ sie od /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "specyfikacja przesuniêcia musi zawieraæ ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "specyfikacja przesuniêcia musi zawieraæ / po ="
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr "¶cie¿ki wy³±czeñ musz± siê zaczynaæ od /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -923,107 +924,107 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "B³±d wewnêtrzny w przetwarzaniu argumentu (%d) :-(\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "tylko jeden typ odpytywania/sprawdzania mo¿na wykonaæ na raz"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr "b³êdna konstrukcja argumentów odpytywania"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr "b³êdna konstrukcja argumentów odpytywania"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "b³êdna konstrukcja argumentów odpytywania"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "tylko instalacjê, uaktualnienie i usuwanie ¼róde³ mo¿na wymusiæ"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "przesuwania plików mo¿na dokonaæ tylko w trakcie instalacji"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate i --excludepath mo¿na u¿yæ tylko w trakcie instalacji nowych "
 "pakietów"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mo¿na u¿yæ tylko w trakcie instalacji nowych pakietów"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty dla --prefix musz± siê rozpoczynaæ od /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie mo¿na jednocze¶nie u¿yæ --excludedocs i --includedocs"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mo¿na u¿yæ tylko w trakcie usuwania pakietów"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1039,7 +1040,7 @@ msgstr ""
 "--notriggers mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub sprawdzania "
 "pakietów"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1048,14 +1049,14 @@ msgstr ""
 "--nodeps mo¿na u¿yæ tylko w trakcie budowania, instalacji, usuwania lub "
 "sprawdzania pakietów"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub budowania pakietów"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1063,98 +1064,98 @@ msgstr ""
 "--root (-r) mo¿na u¿yæ tylko w trakcie instalacji, usuwania, sprawdzania "
 "pakietów lub przebudowywania bazy"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty dla --root (-r) musz± siê rozpoczynaæ od /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage mo¿na u¿yæ tylko podczas aktualizacji"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp mo¿na u¿yæ tylko w trakcie sprawdzania sygnatury"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg mo¿na u¿yæ tylko podczas sprawdzania sygnatury"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nomd5 mo¿na u¿yæ tylko podczas sprawdzania sygnatury i weryfkiacji pakietu"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "brak dostêpu do pliku %s\n"
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr "nie znaleziono pgp: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr "Podaj has³o: "
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Weryfikacja has³a nieudana\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Has³o jest prawid³owe.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "B³êdny %%_signature spec w pliku makra.\n"
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr "wykonanie nie powiod³o siê\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "nieoczekiwane argumenty dla --querytags "
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "nie podano nazwy pakietu do sprawdzenia sygnatury"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "nie podano nazwy pakietu do podpisania"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "nie podano nazw plików do usuniêcia"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "zbyt wiele argumentów dla odpytywania wszystkich pakietów"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "nie podano argumentów dla trybu zapytañ"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr "zbyt wiele argumentów dla weryfikacji wszystkich pakietów"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "nie podano argumentów dla sprawdzania"
 
@@ -1176,151 +1177,229 @@ msgstr "b³±d odczytu nag³ówka z pakietu\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "nie mo¿na otworzyæ pliku %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "przebuduj istniej±c± bazê"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "znaleziono %d pakietów\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+#, fuzzy
+msgid "skip files with leading component <path> "
+msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>"
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <nazwa pakietu>+ "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "nie wykonuj ¿adnych etapów"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "odpytywanie pakietów zahaczanych przez pakiet"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "      --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "    --upgrade <nazwa pakietu>"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+#, fuzzy
+msgid "Signature options:"
+msgstr "Rozmiar sygnatury: %d\n"
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "U¿ycie: rpm {--help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <katalog>]"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [cel]"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [cel]"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile <plik>]"
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=platforma1[,platforma2...]]"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] plik_spec"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       rpm {--rmsource} [--rcfile <plik>] [-v] plik_spec"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--rebuild} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... ¼ród³owyN.rpm"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--recompile} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... "
-"¼ród³owyN.rpm"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "                        plik1.rpm ... plikN.rpm"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1328,50 +1407,50 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   wszystkie tryby pracy pozwalaj± u¿yæ nastêpuj±cych argumentów:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    --pipe <komenda>      "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <komenda>      "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "U¿yj -e lub --erase\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "      --dbpath <katalog>      "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "      --root <katalog>        "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1379,269 +1458,219 @@ msgstr ""
 "   instalacja, uaktualnianie i odpytywanie (z opcj± -p) pozwalaj± u¿yæ URL'a "
 "ftp zamiast"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   nazwy pliku tak jak i nastêpuj±cych opcji:"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "      --ftpproxy <host>   "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <port>    "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "      --httpproxy <host>   "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "      --httpport <port>    "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Opcje selekcjonuj±ce pakiety:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "odpytuj wszystkie pakiety"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "        -f <plik>+        "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "zapytaj do jakiego pakietu nale¿y <plik>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "        -p <nazwa pakietu>+ "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "odpytaj (niezainstalowany) pakiet <nazwa pakietu>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <pakiet>"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "odpytaj pakiety zahaczane przez <pakiet>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --whatprovides <zas>"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "odszukaj pakiety udostêpniaj±ce zasób <zas>"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --whatrequires <zas>"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 #, fuzzy
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <format zapytania>"
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Opcje odpytuj±ce pakiety:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "wypisz zasoby udostêpniane przez pakiet"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "wypisz zasoby udostêpniane przez pakiet"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "wy¶wietl skrypty [de]instalacyjne"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr "wy¶wietl trigger skrypty zawarte w pakiecie"
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "nie wykonuj ¿adnych etapów"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "    --install <nazwa pakietu>"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <nazwa pakietu>      "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <¶cie¿ka>"
 
-#: rpmqv.c:521
-#, fuzzy
-msgid "skip files with leading component <path> "
-msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>"
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "odpytywanie pakietów zahaczanych przez pakiet"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <katalog>      "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <nazwa pakietu>"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -U <nazwa pakietu>      "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "    --erase <pakiet>"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<etap> <plik-spec>  "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -t<etap> <plik-tar>   "
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "pakiet nie ma nazwy"
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "      --buildroot <katalog>"
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "      --target=<platforma>+"
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    --rebuild <pkt_¼ród³> "
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    --recompile <pkt_¼ród³>"
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --resign <pakiet>+    "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --addsign <pakiet>+   "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <pakiet>+  "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    --resign <pakiet>+    "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "przebuduj istniej±c± bazê"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "U¿yj -e lub --erase\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath podano dla operacji nie u¿ywaj±cej bazy"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakietów do przebudowania"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "nie podano nazw plików spec do budowania"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
@@ -2905,118 +2934,150 @@ msgid ""
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr "buildroot by³ ju¿ wcze¶niej podany"
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "preparuj (rozpakuj ¼ród³a i na³ó¿ ³aty)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "instacja pakietu ¼ród³owego\n"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "preparuj (rozpakuj ¼ród³a i na³ó¿ ³aty)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
+
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
-msgstr ""
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
+msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "znaleziono %d pakietów\n"
+
+#: lib/poptBT.c:168
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "instacja pakietu ¼ród³owego\n"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr "wymu¶ build root"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr "nie wykonuj ¿adnych etapów budowania"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:187
+#, fuzzy
+msgid "do not accept i18N msgstr's from specfile"
 msgstr "nie akceptuj wpisów I18N ze speca"
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr "usuñ speca po zakoñczeniu"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr "wymu¶ platformê docelow±"
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+#, fuzzy
+msgid "lookup i18N strings in specfile catalog"
 msgstr "wyszukaj wpisy I18N w katalogu speca"
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "zapytaj do jakiego pakietu nale¿y <plik>"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "odpytywanie pakietów w grupie"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "odpytywanie pakietu"
 
 #: lib/poptQV.c:76
@@ -3032,8 +3093,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "odpytywanie pliku spec"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+#, fuzzy
+msgid "query the package(s) triggered by the package"
 msgstr "odpytywanie pakietów zahaczanych przez pakiet"
 
 #: lib/poptQV.c:86
@@ -3047,43 +3113,45 @@ msgid "rpm verify mode (legacy)"
 msgstr "tryb odpytywania"
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr "odpytywanie pakietów wymagaj±cych zasobu"
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr "odpytywanie pakietów udostêpniaj±cych zasób"
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "odszukaj pakiety udostêpniaj±ce zasób <zas>"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr "wy¶wietl wszystkie pliki konfiguracyjne"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr "wy¶wietl wszystkie pliki dokumentacji"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr "podaj postawowe informacje o pliku"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr "wy¶wietl pliki zawarte w pakiecie"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr "u¿yj nastêpuj±cego formatu zapytania"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr "wy¶wietl status pokazywanych plików"
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr "wy¶wietl wiêcej informacji o plikach z listy"
 
@@ -3953,28 +4021,33 @@ msgstr "uruchamianie skryptu postinstalacyjnego (je¦li istnieje)\n"
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "wykonanie skryptu nie powiod³o siê"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "nie wykonuj ¿adnych etapów"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 "pakiet nie specyfikuje ani nazwy u¿ytkownika ani list id (to nie powinno siê "
 "zdarzyæ)"
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê "
 "zdarzyæ)"
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "brak    %s\n"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
@@ -4183,6 +4256,77 @@ msgstr "nie mo¿na otworzyæ %s: %s"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile <plik>]"
+
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=platforma1[,platforma2...]]"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] plik_spec"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       rpm {--rmsource} [--rcfile <plik>] [-v] plik_spec"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--rebuild} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... ¼ród³owyN.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--recompile} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... "
+#~ "¼ród³owyN.rpm"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "                        plik1.rpm ... plikN.rpm"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<etap> <plik-spec>  "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -t<etap> <plik-tar>   "
+
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "pakiet nie ma nazwy"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "      --buildroot <katalog>"
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "      --target=<platforma>+"
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    --rebuild <pkt_¼ród³> "
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    --recompile <pkt_¼ród³>"
+
+#~ msgid "query the packages which require a capability"
+#~ msgstr "odpytywanie pakietów wymagaj±cych zasobu"
+
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "odpytywanie pakietów udostêpniaj±cych zasób"
+
 #~ msgid "exec failed!\n"
 #~ msgstr "uruchomienie nie powiod³o siê!\n"
 
diff --git a/po/pt.po b/po/pt.po
index 6cf6fee60..4105d06b0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-08-01 21:11+01:00\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt <morais@poli.org>\n"
@@ -25,63 +25,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr "não consigo abrir ficheiro spec %s: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "não consigo abrir ficheiro spec %s: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "não consigo abrir ficheiro spec %s: %s\n"
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -102,11 +102,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -115,30 +115,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -147,7 +147,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -165,20 +165,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -190,19 +190,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -210,12 +210,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -235,11 +235,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -256,7 +256,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -268,15 +268,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -288,7 +288,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -316,15 +316,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -340,7 +340,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -348,7 +348,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -356,7 +356,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -364,11 +364,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -448,31 +448,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -494,25 +494,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -524,7 +525,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -540,11 +541,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -552,47 +553,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -600,23 +601,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -628,11 +629,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -642,17 +643,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -664,52 +665,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -717,7 +718,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -725,11 +726,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -745,7 +746,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -755,7 +756,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -763,7 +764,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -771,7 +772,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -783,19 +784,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -807,50 +808,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -858,105 +859,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -968,115 +969,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1098,397 +1099,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2739,108 +2773,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2855,8 +2916,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2868,42 +2933,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3767,24 +3832,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7d1380340..08cca0b9f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-12-30 13:33-0500\n"
+msgstr "POT-Creation-Date: 2001-01-01 18:02-0500\n"
 
 # , c-format
 #: build.c:26
@@ -22,52 +22,52 @@ msgid "Unable to open spec file %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "Não consegui abrir: %s\n"
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "instale pacote"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
@@ -80,16 +80,16 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versão %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
@@ -114,12 +114,12 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <diretório>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -130,35 +130,35 @@ msgstr ""
 "                        [--rcfile <arquivo>] [--ignorearch] [--dbpath "
 "<diretório>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 #, fuzzy
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr "                        [--prefix <diretório>] [--ignoreos] [--nodeps]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
@@ -168,7 +168,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <diretório>] [--noscripts]"
@@ -179,7 +179,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -191,26 +191,26 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 #, fuzzy
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 #, fuzzy
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--provides] [--dump] [--dbpath <diretório>] [alvos]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
@@ -224,23 +224,23 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
@@ -251,14 +251,14 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [alvos]"
 
@@ -282,12 +282,12 @@ msgstr ""
 "       rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
 "<arquivo>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                           pacote1 ... pacoteN"
@@ -307,7 +307,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           pacote1 ... pacoteN"
 
@@ -319,16 +319,16 @@ msgstr "       rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "uso:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "mostra esta mensagem"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "mostra a versão do programa rpm sendo usado"
 
@@ -341,7 +341,7 @@ msgstr "   todos os modos suportam os seguintes argumentos:"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -360,7 +360,7 @@ msgstr "mostra a versão do programa rpm sendo usado"
 msgid "    --pipe <cmd>          "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "envia a saida padrão para <cmd>"
 
@@ -373,15 +373,15 @@ msgstr "    -b<estágio> <spec>    "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "use <arquivo> no lugar de /etc/rpmrc e $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "seja um pouco mais detalhado"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "seja _muito_ mais detalhado (para depuração)"
 
@@ -401,7 +401,7 @@ msgstr "   de nomes de arquivos bem como as seguintes opções:\n"
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "nome do host ou IP do proxy ftp"
 
@@ -409,7 +409,7 @@ msgstr "nome do host ou IP do proxy ftp"
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "número da porta do servidor ftp (ou proxy)"
 
@@ -418,7 +418,7 @@ msgstr "número da porta do servidor ftp (ou proxy)"
 msgid "      --httpproxy <host>  "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "nome do host ou IP do proxy ftp"
@@ -428,12 +428,12 @@ msgstr "nome do host ou IP do proxy ftp"
 msgid "      --httpport <port>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "número da porta do servidor ftp (ou proxy)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "modo pesquisa"
 
@@ -442,7 +442,7 @@ msgstr "modo pesquisa"
 msgid "      --dbpath <dir>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "use <diretório> como diretório para o banco de dados"
 
@@ -450,7 +450,7 @@ msgstr "use <diretório> como diretório para o banco de dados"
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "use s como formato do cabeçalho (implica -i)"
@@ -459,7 +459,7 @@ msgstr "use s como formato do cabeçalho (implica -i)"
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "use <diretório> como diretório raiz"
 
@@ -521,32 +521,32 @@ msgstr "pesquise pacotes que requerem capacidade <i>"
 msgid "      Information selection options:"
 msgstr "      Opcões de selecão de informação"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "mostre informação do pacote"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 #, fuzzy
 msgid "display the package's change log"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "mostre estados dos arquivos (implica -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "liste somente os arquivos de documentação (implica -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "liste somente os arquivos de configuração (implica -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -571,7 +571,7 @@ msgstr "mostra as várias scripts de [des]instalação"
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -579,19 +579,20 @@ msgstr ""
 "verifique uma instalação de pacote usando as mesmas opções de especificação "
 "de pacote do -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "não verifique as dependências do pacote"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "não verifique os checksums md5 do arquivo"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "não verifique os atributos dos arquivos"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "liste as etiquetas que podem ser usadas em um formato de pesquisa"
 
@@ -605,7 +606,7 @@ msgstr "instale pacote"
 msgid "    -i <packagefile>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "instale pacote"
 
@@ -623,11 +624,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "não foi passado pacote para instalação"
@@ -636,48 +637,48 @@ msgstr "não foi passado pacote para instalação"
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "realoque o pacote para <diretório>, se realocável"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "não instale documentação"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "aliás para --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 #, fuzzy
 msgid "don't verify package architecture"
 msgstr "não verifique a arquitetura do pacote"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "não verifique o sistema operacional do pacote"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "instale documentação"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 #, fuzzy
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "não verifique as dependências do pacote"
@@ -686,23 +687,23 @@ msgstr "não verifique as dependências do pacote"
 msgid "don't execute any installation scripts"
 msgstr "não execute nenhuma script de instalação"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "instale mesmo que o pacote substitua arquivos já instalados"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "reinstale se o pacote já estiver presente"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "não instale, mas diga se a instalação funcionará ou não"
 
@@ -715,11 +716,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "atualize pacote (mesmas opcões em --install, mais"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -731,11 +732,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "apague (desinstale) pacote"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -743,7 +744,7 @@ msgstr ""
 "remova todos os pacotes iguais a <pacote> (normalmente um erro é gerado se "
 "<pacote> especificou múltiplos pacotes)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "não execute nenhuma script específica do pacote"
 
@@ -756,55 +757,55 @@ msgstr "    -b<estágio> <spec>    "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "Constroi pacote, onde <estágio> é um dos seguintes:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (descompacte fontes e aplique patches)"
 
 # , c-format
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "cheque lista (faça algumas checagens em %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "compile (prep e compile)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "instale (prep, compile, instale)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "pacote binário (prep, compile, instale, pacote)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "pacote bin/src (prep, compile, instale, pacote)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "pule direto para o estágio especificado (somente para c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "gere assinatura PGP"
@@ -814,7 +815,7 @@ msgstr "gere assinatura PGP"
 msgid "      --buildroot <dir>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 #, fuzzy
 msgid "use <dir> as the build root"
 msgstr "use s como o root da construção"
@@ -823,11 +824,11 @@ msgstr "use s como o root da construção"
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "não execute nenhum estágio"
 
@@ -845,7 +846,7 @@ msgstr "atribua S segundos ao tempo de checagem (0 o desabilita)"
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -857,7 +858,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "como --rebuild, mas não construa nenhum pacote"
 
@@ -866,7 +867,7 @@ msgstr "como --rebuild, mas não construa nenhum pacote"
 msgid "    --resign <pkg>+       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
@@ -875,7 +876,7 @@ msgstr "assine um pacote (descarte a assinatura corrente)"
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "adicione uma assinatura a um pacote"
 
@@ -889,20 +890,20 @@ msgstr "    -b<estágio> <spec>    "
 msgid "    -K <pkg>+             "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "verifique a assinatura do pacote"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "desconsidere quaisquer assinaturas PGP"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "desconsidere quaisquer assinaturas PGP"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "desconsidere quaisquer assinaturas MD5"
 
@@ -914,7 +915,7 @@ msgstr "certifique que um banco de dados válido existe"
 msgid "rebuild database from existing database"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -922,7 +923,7 @@ msgstr ""
 "atribua as permissões dos arquivos para aquelas no banco de dados de pacotes "
 "usando as mesmas opções de especificação de pacote do -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -931,39 +932,39 @@ msgstr ""
 "usando as mesmas opções de especificação de pacote do -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u e --uninstall foram descontinuados e não funcionam mais.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Use -e ou --erase no lugar.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 #, fuzzy
 msgid "relocations must begin with a /"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -971,126 +972,126 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "um tipo de pesquisa/verificação pode ser feita por vez"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "fonte de pesquisa não esperado"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "fonte de pesquisa não esperado"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "fonte de pesquisa não esperado"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "somente instalação e atualização podem ser forçadas"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--prefix somente pode ser usada quando se está instalando novos pacotes"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 "--prefix somente pode ser usada quando se está instalando novos pacotes"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem começar com uma /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente podem ser especificado durante instalações de pacotes"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante desinstalações de pacotes"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test somente pode ser especificado durante [des]instalações e construções "
 "de pacotes"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1107,7 +1108,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalações e "
 "verificações de pacotes"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1116,7 +1117,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalações e "
 "verificações de pacotes"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1124,7 +1125,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalações e construções "
 "de pacotes"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1132,24 +1133,24 @@ msgstr ""
 "--root (-r) somente pode ser especificado durante [des]instalações, "
 "pesquisas e reconstrução de bancos de dados"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumentos para --root (-r) devem começar com uma /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage somente pode ser usado durante a atualização de pacotes"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
@@ -1157,79 +1158,79 @@ msgstr ""
 "--nopgp somente pode ser usado durante checagem de assinaturas e verificação "
 "de pacotes"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 #, fuzzy
 msgid "pgp not found: "
 msgstr "não foi passado pacote para desinstalação"
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Checagem de pass phrase falhou\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Pass phrase ok.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign somente pode ser usado durante a construção de pacotes"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 #, fuzzy
 msgid "exec failed\n"
 msgstr "Construção falhou.\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos não esperados em --querytags"
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "nenhum pacote informado para checagem de assinatura"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "não foram passados pacotes para assinatura"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "não foi passado pacote para desinstalação"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "não foi passado pacote para instalação"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "não foi passado argumento para pesquisa"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "não foi passado argumento para verificação"
 
@@ -1253,49 +1254,169 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "mostra a versão do programa rpm sendo usado"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "pesquise todos os pacotes"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "não foi passado pacote para instalação"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "    -b<estágio> <spec>    "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "não execute nenhum estágio"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "pesquise o pacote ao qual <arquivo> pertence"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "                        [--nomd5] [alvos]"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "instale pacote"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "uso: rpm {--help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <diretório>]"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
@@ -1303,14 +1424,14 @@ msgstr ""
 "                        [--rcfile <arquivo>] [--ignorearch] [--dbpath "
 "<diretório>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
@@ -1318,141 +1439,94 @@ msgstr ""
 "       rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
 "<arquivo>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [alvo]"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [alvo]"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<arquivo>]"
-
-#: rpmqv.c:350
-#, fuzzy
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--nomd5] [alvos]"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-"                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-"       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--rebuild} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "                        arquivo.rpm ... arquivoN.rpm"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   todos os modos suportam os seguintes argumentos:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "mostra a versão do programa rpm sendo usado"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Use -e ou --erase no lugar.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1460,251 +1534,203 @@ msgstr ""
 "  Instale, atualize e pesquise (com -p) permitem que sejam usadas URLs ftp "
 "no lugar"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   de nomes de arquivos bem como as seguintes opções:\n"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Opcões para especificação de pacotes:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "pesquise todos os pacotes"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "pesquise pacote (não instalado) <arquivo-pacote>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "pesquise pacotes que requerem capacidade <i>"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Opcões de selecão de informação"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "lista as capacidades que o pacote fornece"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "lista as capacidades que o pacote fornece"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "mostra as várias scripts de [des]instalação"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "não execute nenhum estágio"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "instale pacote"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "não execute nenhuma script de instalação"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "pesquise o pacote ao qual <arquivo> pertence"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "instale pacote"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "instale pacote"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    -b<estágio> <spec>    "
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Use -e ou --erase no lugar.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath passado para uma operação que não usa um banco de dados"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
@@ -1712,15 +1738,15 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalações e construções "
 "de pacotes"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "não foram passados pacotes para reconstrução"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "não foi passado arquivo spec para construção"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "não foram passados arquivos tar para construção"
 
@@ -3031,120 +3057,151 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "prep (descompacte fontes e aplique patches)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "instale pacote"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "prep (descompacte fontes e aplique patches)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:155
+#, fuzzy
+msgid "build source and binary packages from <tarball>"
+msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "pesquise o pacote ao qual <arquivo> pertence"
+
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
+msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "pacote binário (prep, compile, instale, pacote)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid "<source package>"
+msgstr "pesquise todos os pacotes"
+
+#: lib/poptBT.c:168
+#, fuzzy
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "instale pacote"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 #, fuzzy
 msgid "override build root"
 msgstr "use s como o root da construção"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "não execute nenhum estágio"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "não foi passado pacote para desinstalação"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "pesquise todos os pacotes"
 
 #: lib/poptQV.c:76
@@ -3161,9 +3218,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "pesquise todos os pacotes"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
 #, fuzzy
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
 #: lib/poptQV.c:86
@@ -3178,49 +3239,49 @@ msgstr "modo pesquisa"
 
 #: lib/poptQV.c:90
 #, fuzzy
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr "pesquise pacotes que requerem capacidade <i>"
 
 #: lib/poptQV.c:92
 #, fuzzy
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all configuration files"
 msgstr "liste somente os arquivos de configuração (implica -l)"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instale documentação"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "dump basic file information"
 msgstr "mostre informação do pacote"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 #, fuzzy
 msgid "list files in package"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "use the following query format"
 msgstr "fonte de pesquisa não esperado"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "mostre a lista de arquivos do pacote"
@@ -4149,25 +4210,30 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "instale pacote"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "não execute nenhum estágio"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
@@ -4380,6 +4446,78 @@ msgid "failed to create %s: %s\n"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
+#~ "<arquivo>]"
+
+#, fuzzy
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--nomd5] [alvos]"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr ""
+#~ "                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr ""
+#~ "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--rebuild} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "                        arquivo.rpm ... arquivoN.rpm"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    -b<estágio> <spec>    "
+
+#, fuzzy
+#~ msgid "query the packages which require a capability"
+#~ msgstr "pesquise pacotes que requerem capacidade <i>"
+
+#, fuzzy
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "pesquise pacotes que fornecem a capacidade <i>"
+
+#, fuzzy
 #~ msgid "   --rcfile <file>        "
 #~ msgstr "    -b<estágio> <spec>    "
 
diff --git a/po/ro.po b/po/ro.po
index df67106b5..475726459 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -23,63 +23,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -100,11 +100,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -113,30 +113,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -163,20 +163,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -188,19 +188,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -208,12 +208,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -233,11 +233,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -254,7 +254,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -266,15 +266,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -286,7 +286,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -314,15 +314,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -338,7 +338,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -354,7 +354,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -362,11 +362,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -446,31 +446,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -492,25 +492,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -522,7 +523,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -538,11 +539,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -550,47 +551,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -598,23 +599,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -626,11 +627,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -640,17 +641,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -662,52 +663,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -715,7 +716,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -723,11 +724,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -743,7 +744,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -753,7 +754,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -761,7 +762,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -769,7 +770,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -781,19 +782,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -805,50 +806,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -856,105 +857,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -966,115 +967,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1096,397 +1097,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2737,108 +2771,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2853,8 +2914,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2866,42 +2931,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3761,24 +3826,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 4142caa0d..0e49152ef 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index b6bc80a1e..ce58fb4db 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-08-08 01:20+0300\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -24,64 +24,64 @@ msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÓÂÏÒËÉ:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ spec ÆÁÊÌÁ %s: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ tar: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ spec ÉÚ %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "îÅ ÍÏÇÕ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "îÅ ÏÂÙÞÎÙÊ ÆÁÊÌ: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "æÁÊÌ %s ÎÅ ÐÏÈÏÖ ÎÁ spec ÆÁÊÌ.\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "ãÅÌÅ×ÙÅ ÐÌÁÔÆÏÒÍÙ ÄÌÑ ÓÂÏÒËÉ: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr "óÂÏÒËÁ ÄÌÑ ÃÅÌÅ×ÏÊ ÐÌÁÔÆÏÒÍÙ %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ×ÅÒÓÉÑ %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "íÏÖÅÔ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØÓÑ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL."
@@ -104,12 +104,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <ËÁÔÁÌÏÇ>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -119,35 +119,35 @@ msgid ""
 msgstr ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁÌÏÇ>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <ËÁÔ.>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <ÁÄÒÅÓ>] [--ftpport <ÐÏÒÔ>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <ÁÄÒÅÓ>] [--httpport <ÐÏÒÔ>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate "
 "ÓÔÁÒÙÊÐÕÔØ=ÎÏ×ÙÊÐÕÔØ]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <ÐÕÔØ>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] file1.rpm ... fileN.rpm"
 
@@ -157,7 +157,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <ËÁÔÁÌÏÇ>] [--noscripts]"
@@ -168,7 +168,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -178,22 +178,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <host>] [--httpport <ÐÏÒÔ>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate oldpath=newpath]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <ÐÕÔØ>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        file1.rpm ... fileN.rpm"
 
@@ -206,19 +206,19 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <ËÁÔÁÌÏÇ>] [ÃÅÌÉ]"
 
@@ -227,13 +227,13 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <ËÁÔ>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [ÃÅÌÉ]"
 
@@ -254,11 +254,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <ËÁÔÁÌÏÇ>] [--noscripts] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <ËÁÔÁÌÏÇ>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] ÐÁËÅÔ1 ... ÐÁËÅÔN"
 
@@ -276,7 +276,7 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           ÐÁËÅÔ1 ... ÐÁËÅÔN"
 
@@ -288,15 +288,15 @@ msgstr "       rpm {--rebuilddb} [--rcfile <ÆÁÊÌ>] [--dbpath <ËÁÔÁÌÏÇ>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "×Ù×ÅÓÔÉ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "×Ù×ÅÓÔÉ ×ÅÒÓÉÀ ÉÓÐÏÌØÚÕÅÍÏÇÏ rpm"
 
@@ -308,7 +308,7 @@ msgstr "   ÷ÓÅ ÒÅÖÉÍÙ ÐÏÄÄÅÒÖÉ×ÁÀÔ ÓÌÅÄÕÀÝÉÅ ÁÒÇÕÍÅÎÔÙ:"
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'"
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr "ÏÐÒÅÄÅÌÉÔØ ÍÁËÒÏÓ <ÉÍÑ> ÓÏ ÚÎÁÞÅÎÉÅÍ <ÐÏÄÓÔÁÎÏ×ËÁ>"
 
@@ -324,7 +324,7 @@ msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <cmd>          "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "ÐÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × <cmd>"
 
@@ -336,15 +336,15 @@ msgstr "      --rcfile <ÆÁÊÌ>     "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ÆÁÊÌ> ×ÍÅÓÔÏ /etc/rpmrc É $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr "ÐÏËÁÚÁÔØ ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ rpmrc É ÍÁËÒÏÓÏ×"
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "ÂÙÔØ ÎÅÍÎÏÇÏ ÒÁÚÇÏ×ÏÒÞÉ×ÅÅ"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "ÂÙÔØ ïþåîø ÒÁÚÇÏ×ÏÒÞÉ×ÙÍ (ÄÌÑ ÏÔÌÁÄËÉ)"
 
@@ -362,7 +362,7 @@ msgstr "   ÉÍÅÎ ÆÁÊÌÏ× Á ÔÁËÖÅ ÓÌÅÄÕÀÝÉÅ ÏÐÃÉÉ:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <ÁÄÒÅÓ>  "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ ftp proxy"
 
@@ -370,7 +370,7 @@ msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ ftp proxy"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <ÐÏÒÔ>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "ÎÏÍÅÒ ÐÏÒÔÁ ftp-ÓÅÒ×ÅÒÁ (ÉÌÉ proxy)"
 
@@ -378,7 +378,7 @@ msgstr "ÎÏÍÅÒ ÐÏÒÔÁ ftp-ÓÅÒ×ÅÒÁ (ÉÌÉ proxy)"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <ÁÄÒÅÓ>  "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ http proxy"
 
@@ -386,11 +386,11 @@ msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ http proxy"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <ÐÏÒÔ>    "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "ÎÏÍÅÒ ÐÏÒÔÁ http-ÓÅÒ×ÅÒÁ (ÉÌÉ proxy)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "ÒÅÖÉÍ ÚÁÐÒÏÓÁ"
 
@@ -398,7 +398,7 @@ msgstr "ÒÅÖÉÍ ÚÁÐÒÏÓÁ"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <ËÁÔÁÌÏÇ>  "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÁÔÁÌÏÇ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
 
@@ -406,7 +406,7 @@ msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÁÔÁÌÏÇ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <qfmt> ËÁË ÆÏÒÍÁÔ ÚÁÇÏÌÏ×ËÁ (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -i)"
 
@@ -414,7 +414,7 @@ msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <qfmt> ËÁË ÆÏÒÍÁÔ ÚÁÇÏÌÏ×ËÁ (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -i)"
 msgid "      --root <dir>        "
 msgstr "      --root <ËÁÔÁÌÏÇ>    "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ"
 
@@ -470,31 +470,31 @@ msgstr "ÎÁÊÔÉ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓÁ <cap>"
 msgid "      Information selection options:"
 msgstr "      ïÐÃÉÉ ×ÙÂÏÒÁ ÉÎÆÏÒÍÁÃÉÉ:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ÐÁËÅÔÅ"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "×Ù×ÅÓÔÉ ÐÒÏÔÏËÏÌ ÉÚÍÅÎÅÎÉÊ ÐÁËÅÔÁ"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "×Ù×ÅÓÔÉ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÏ× (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "×Ù×ÅÓÔÉ ÔÏÌØËÏ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "×Ù×ÅÓÔÉ ÔÏÌØËÏ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ (ÐÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -518,7 +518,7 @@ msgstr "×Ù×ÅÓÔÉ ÒÁÚÎÏÏÂÒÁÚÎÙÅ [ÄÅ]ÉÎÓÔÁÌÌÑÃÉÏÎÎÙÅ ÓËÒÉÐÔÙ"
 msgid "show the trigger scripts contained in the package"
 msgstr "ÐÏËÁÚÁÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÙ, ÓÏÄÅÒÖÁÝÉÅÓÑ × ÐÁËÅÔÅ"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -526,19 +526,20 @@ msgstr ""
 "×ÅÒÉÆÉÃÉÒÏ×ÁÔØ ÉÎÓÔÁÌÌÑÃÉÀ ÐÁËÅÔÁ, ÉÓÐÏÌØÚÕÑ ÔÅ ÖÅ ÏÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ "
 "ÐÁËÅÔÁ, ÞÔÏ É -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÐÁËÅÔÁ"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÙÅ md5-ÓÕÍÍÙ ÆÁÊÌÏ×"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÁÔÔÒÉÂÕÔÙ ÆÁÊÌÏ×"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "×Ù×ÅÓÔÉ ÔÜÇÉ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ × ÆÏÒÍÁÔÅ ÚÁÐÒÏÓÁ"
 
@@ -550,7 +551,7 @@ msgstr "    --install <ÆÁÊÌ ÐÁËÅÔÁ>"
 msgid "    -i <packagefile>      "
 msgstr "    -i <ÆÁÊÌ ÐÁËÅÔÁ>      "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ"
 
@@ -566,11 +567,11 @@ msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ × ÐÕÔÉ <ÐÕÔØ>"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <oldpath>=<newpath>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ ÉÚ <oldpath> × <newpath>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ × ÎÅÐÅÒÅÍÅÝÁÅÍÏÍ ÐÁËÅÔÅ"
 
@@ -578,49 +579,49 @@ msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ × ÎÅÐÅÒÅÍÅÝÁÅÍÏÍ ÐÁËÅÔÅ"
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <ËÁÔÁÌÏÇ>  "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "ÐÅÒÅÍÅÓÔÉÔØ ÐÁËÅÔ × <ËÁÔÁÌÏÇ>, ÅÓÌÉ ÐÁËÅÔ ÜÔÏ ÐÏÚ×ÏÌÑÅÔ"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÏËÕÍÅÎÔÁÃÉÀ"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "ÓÏËÒÁÝÅÎÉÅ ÄÌÑ --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "×Ù×ÏÄÉÔØ \"#\" ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ (ÈÏÒÏÛÏ Ó -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÷óå ÆÁÊÌÙ, ÄÁÖÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ, ËÏÔÏÒÙÅ ÍÏÇÌÉ ÂÙ ÂÙÔØ "
 "ÐÒÏÐÕÝÅÎÙ"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÁÒÈÉÔÅËÔÕÒÕ ÐÁËÅÔÁ"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï ÐÅÒÅÄ ÕÓÔÁÎÏ×ËÏÊ"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÏÐÅÒÁÃÉÏÎÎÕÀ ÓÉÓÔÅÍÕ ÐÁËÅÔÁ"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ÄÏËÕÍÅÎÔÁÃÉÀ"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "ÏÂÎÏ×ÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ, ÎÏ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ÎÅ ÍÅÎÑÔØ ÐÏÒÑÄÏË ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ"
 
@@ -628,23 +629,23 @@ msgstr "ÎÅ ÍÅÎÑÔØ ÐÏÒÑÄÏË ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÏ× ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ"
 msgid "don't execute any installation scripts"
 msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ËÁËÉÈ-ÌÉÂÏ ÕÓÔÁÎÏ×ÏÞÎÙÈ ÓËÒÉÐÔÏ×"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÏ×, ×Ú×ÅÄÅÎÎÙÈ ÎÁ ÜÔÏÔ ÐÁËÅÔ"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "×Ù×ÏÄÉÔØ ÐÒÏÃÅÎÔ ÇÏÔÏ×ÎÏÓÔÉ ÐÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÄÁÖÅ ÅÓÌÉ ÐÁËÅÔ ÐÅÒÅÐÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ, ÅÓÌÉ ÐÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂÝÉÔØ, ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ"
 
@@ -656,11 +657,11 @@ msgstr "    --upgrade <ÆÁÊÌ ÐÁËÅÔÁ>"
 msgid "    -U <packagefile>      "
 msgstr "    -U <ÆÁÊÌ ÐÁËÅÔÁ>      "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÐÁËÅÔÁ (ÔÅ ÖÅ ÏÐÃÉÉ, ÞÔÏ É Ó --install, ÐÌÀÓ)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -672,11 +673,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <ÐÁËÅÔ>  "
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "ÕÄÁÌÉÔØ (ÄÅÉÎÓÔÁÌÌÉÒÏ×ÁÔØ) ÐÁËÅÔ"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -684,7 +685,7 @@ msgstr ""
 "ÕÄÁÌÉÔØ ×ÓÅ ÐÁËÅÔÙ, ÓÏ×ÐÁÄÁÀÝÉÅ Ó <ÐÁËÅÔ> (ÏÂÙÞÎÏ, ÅÓÌÉ <ÐÁËÅÔ> "
 "ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÅÓËÏÌØËÉÍ ÐÁËÅÔÁÍ, ÇÅÎÅÒÉÒÕÅÔÓÑ ÏÛÉÂËÁ)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÓËÒÉÐÔÏ×, ÓÐÅÃÉÆÉÞÎÙÈ ÄÌÑ ÐÁËÅÔÁ"
 
@@ -696,53 +697,53 @@ msgstr "    -b<stage> <spec>      "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<stage> <tarball>   "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "ÓÏÂÒÁÔØ ÐÁËÅÔ, ÇÄÅ <stage> - ÏÄÎÏ ÉÚ:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (ÓÅËÃÉÑ %prep, ÒÁÚ×ÅÒÎÕÔØ ÉÓÈÏÄÎÉËÉ É ÎÁÌÏÖÉÔØ ÚÁÐÌÁÔÙ)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "list check (ÐÒÏÉÚ×ÅÓÔÉ ÐÒÏ×ÅÒËÕ ÓÅËÃÉÉ %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "compile (ÉÓÐÏÌÎÉÔØ %prep É %build)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "install (ÉÓÐÏÌÎÉÔØ %prep, %build É %install)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "binary package (ÉÓÐÏÌÎÉÔØ %prep, %build, %install É ÓÏÚÄÁÔØ RPM)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "bin/src package (ÉÓÐÏÌÎÉÔØ %prep, %build, %install, ÓÏÚÄÁÔØ RPM É SRPM)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "ÐÅÒÅÊÔÉ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ Ë ÕËÁÚÁÎÎÏÍÕ ÜÔÁÐÕ (ÔÏÌØËÏ ÄÌÑ c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÄÅÒÅ×Ï ÉÓÈÏÄÎÉËÏ×"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr "ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÉÓÈÏÄÎÉËÉ"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr "ÕÄÁÌÉÔØ spec-ÆÁÊÌ ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ PGP/GPG-ÐÏÄÐÉÓØ"
 
@@ -750,7 +751,7 @@ msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ PGP/GPG-ÐÏÄÐÉÓØ"
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <ËÁÔ.>  "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔ.> ËÁË ËÏÒÎÅ×ÏÊ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÁ"
 
@@ -758,11 +759,11 @@ msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ <ËÁÔ.> ËÁË ËÏÒÎÅ×ÏÊ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÁËÅÔÁ"
 msgid "      --target=<platform>+"
 msgstr "      --target=<ÐÌÁÔÆÏÒÍÁ>+"
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "ÓÏÂÒÁÔØ ÐÁËÅÔÙ ÄÌÑ ÃÅÌÅ×ÙÈ ÐÌÁÔÆÏÒÍ ÐÌÁÔÆÏÒÍÁ1...ÐÌÁÔÆÏÒÍÁN"
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁÐÏ×"
 
@@ -778,7 +779,7 @@ msgstr "ÕÓÔÁÎÏ×ÉÔØ ÐÒÏ×ÅÒËÕ ×ÒÅÍÅÎÉ × <secs> ÓÅËÕÎÄ (0 ÏÔÍÅÎÑÅÔ ÅÅ)"
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <src_pkg>   "
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -790,7 +791,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <src_pkg> "
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "ËÁË --rebuild, ÎÏ ÎÅ ÓÏÂÉÒÁÅÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×"
 
@@ -798,7 +799,7 @@ msgstr "ËÁË --rebuild, ÎÏ ÎÅ ÓÏÂÉÒÁÅÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×"
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pkg>+       "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
 
@@ -806,7 +807,7 @@ msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pkg>+      "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "ÄÏÂÁ×ÉÔØ ÐÏÄÐÉÓØ Ë ÐÁËÅÔÕ"
 
@@ -818,19 +819,19 @@ msgstr "    --checksig <pkg>+"
 msgid "    -K <pkg>+             "
 msgstr "    -K <ÐÁËÅÔ>+           "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ × ÐÁËÅÔÅ"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ PGP-ÐÏÄÐÉÓÉ"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ GPG-ÐÏÄÐÉÓÉ"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ MD5-ÐÏÄÐÉÓÉ"
 
@@ -842,7 +843,7 @@ msgstr "ÕÂÅÄÉÔØÓÑ, ÞÔÏ ÓÕÝÅÓÔ×ÕÅÔ ÐÒÁ×ÉÌØÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ"
 msgid "rebuild database from existing database"
 msgstr "ÐÅÒÅÓÔÒÏÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÉÚ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÂÁÚÙ"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -850,7 +851,7 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÉÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÆÁÊÌÏ× ÔÁËÉÅ ÖÅ, ËÁË × ÂÁÚÅ ÄÁÎÎÙÈ ÐÁËÅÔÁ, "
 "ÉÓÐÏÌØÚÕÑ ÔÅ ÖÅ ÏÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÁËÅÔÁ, ÞÔÏ É -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -859,37 +860,37 @@ msgstr ""
 "ÉÓÐÏÌØÚÕÑ ÔÅ ÖÅ ÏÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÁËÅÔÁ, ÞÔÏ É -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÖÉÍÏ×"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "ÏÐÃÉÉ -u É --uninstall ÕÓÔÁÒÅÌÉ É ÂÏÌØÛÅ ÎÅ ÒÁÂÏÔÁÀÔ.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "÷ÍÅÓÔÏ ÎÉÈ ÉÓÐÏÌØÚÕÊÔÅ -e ÉÌÉ --erase.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "ÐÅÒÅÍÅÝÅÎÉÑ ÄÏÌÖÎÙ ÉÍÅÔØ / ÐÏÓÌÅ ="
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr "ÉÓËÌÀÞÅÎÉÑ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -897,111 +898,111 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ ÁÒÇÕÍÅÎÔÏ× (%d) :-(\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "ÚÁ ÏÄÉÎ ÒÁÚ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌÎÅÎ ÔÏÌØËÏ ÏÄÉÎ ÔÉÐ ÐÒÏ×ÅÒËÉ ÉÌÉ ÚÁÐÒÏÓÁ"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÆÌÁÇÉ ÚÁÐÒÏÓÁ"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏÞÎÉË ÚÁÐÒÏÓÁ"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "ÐÒÉÎÕÄÉÔÅÌØÎÙÍÉ ÍÏÇÕÔ ÂÙÔØ ÔÏÌØËÏ ÕÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ, ÕÄÁÌÅÎÉÅ ÉÓÈÏÄÎÉËÏ× "
 "É spec-ÆÁÊÌÁ"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "ÆÁÊÌÙ ÍÏÇÕÔ ÂÙÔØ ÐÅÒÅÍÅÝÅÎÙ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÏÄÎÁ ÉÚ ÏÐÃÉÊ --prefix ÉÌÉ --relocate"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "ÏÐÃÉÉ --relocate É --excludepath ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ "
 "ÎÏ×ÙÈ ÐÁËÅÔÏ×"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "ÏÐÃÉÀ --prefix ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÎÏ×ÙÈ ÐÁËÅÔÏ×"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --prefix ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --hash (-h) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --percent ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --replacefiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --replacepkgs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --excludedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --includedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÏÄÎÁ ÉÚ ÏÐÃÉÊ --excludedocs ÉÌÉ --includedocs"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --ignorearch ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --ignoreos ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --ignoresize ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "ÏÐÃÉÑ --allmatches ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "ÏÐÃÉÑ --allfiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÐÁËÅÔÁ"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "ÏÐÃÉÑ --justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ÐÁËÅÔÁ"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1017,7 +1018,7 @@ msgstr ""
 "ÏÐÃÉÑ --notriggers ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
 "×ÅÒÉÆÉËÁÃÉÉ ÐÁËÅÔÁ"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1025,7 +1026,7 @@ msgstr ""
 "ÏÐÃÉÑ --nodeps ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ, ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
 "×ÅÒÉÆÉËÁÃÉÉ ÐÁËÅÔÏ×"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1033,7 +1034,7 @@ msgstr ""
 "ÏÐÃÉÑ --test ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÓÂÏÒËÅ "
 "ÐÁËÅÔÁ"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1041,100 +1042,100 @@ msgstr ""
 "ÏÐÃÉÑ --root (-r) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ, "
 "ÚÁÐÒÏÓÁÈ ÐÁËÅÔÁ É ÐÅÒÅÓÔÒÏÅÎÉÉ ÂÁÚÙ ÄÁÎÎÙÈ"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --root (-r) ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 "ÏÐÃÉÑ --oldpackage ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÐÁËÅÔÏ×"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "ÏÐÃÉÑ --nopgp ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr "ÏÐÃÉÑ --nogpg ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "ÏÐÃÉÑ --nomd5 ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÐÒÏ×ÅÒËÅ ÐÏÄÐÉÓÉ É "
 "×ÅÒÉÆÉËÁÃÉÉ ÐÁËÅÔÁ"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr "ÎÅÔ ÆÁÊÌÏ× ÄÌÑ ÐÏÄÐÉÓÉ\n"
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "ÎÅÔ ÄÏÓÔÕÐÁ Ë ÆÁÊÌÕ %s\n"
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr "pgp ÎÅ ÎÁÊÄÅÎÁ: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr "÷×ÅÄÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: "
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "îÅ×ÅÒÎÁÑ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "ëÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÐÒÉÎÑÔÁ.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ.\n"
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "ÏÐÃÉÑ --sign ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ ÐÁËÅÔÏ×"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr "ÚÁÐÕÓË ÎÅ ÕÄÁÌÓÑ\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÒÏ×ÅÒËÉ ÐÏÄÐÉÓÉ"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÏÄÐÉÓÉ"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "× ÚÁÐÒÏÓÅ ËÏ ×ÓÅÍ ÐÁËÅÔÁÍ ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr "× ÚÁÐÒÏÓÅ ×ÅÒÉÆÉËÁÃÉÉ ×ÓÅÈ ÐÁËÅÔÏ× ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
 
@@ -1156,151 +1157,228 @@ msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÚÁÇÏÌÏ×ËÁ ÉÚ ÐÁËÅÔÁ\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ payload: %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'"
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "ÐÅÒÅÉÎÄÅËÓÉÒÏ×ÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "ÎÅÔ ÐÁËÅÔÏ×\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ × ÐÕÔÉ <ÐÕÔØ>"
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "ÐÁËÅÔ %s-%s-%s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <ÆÁÊÌ ÐÁËÅÔÁ>+ "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁÐÏ×"
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÏ×, ×Ú×ÅÄÅÎÎÙÈ ÎÁ ÜÔÏÔ ÐÁËÅÔ"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "      --relocate <oldpath>=<newpath>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "    --upgrade <ÆÁÊÌ ÐÁËÅÔÁ>"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+#, fuzzy
+msgid "Signature options:"
+msgstr "òÁÚÍÅÒ ÐÏÄÐÉÓÉ: %d\n"
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s {--help}\n"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <ËÁÔÁÌÏÇ>]\n"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <ÆÁÊÌ>] [--dbpath <ËÁÔÁÌÏÇ>]\n"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁÌÏÇ>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <ÆÁÊÌ>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <ËÁÔÁÌÏÇ>] [--noscripts] [--rcfile <ÆÁÊÌ>]\n"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]\n"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [ÃÅÌØ]\n"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [ÃÅÌØ]\n"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<ÆÁÊÌ>]\n"
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=platform1[,platform2...]]"
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] [--rmspec] specfile"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       %s {--rmsource} [--rcfile <ÆÁÊÌ>] [-v] specfile\n"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--rebuild} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--recompile} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "       %s {--freshen -F} ÆÁÊÌ1.rpm ... ÆÁÊÌN.rpm\n"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <ÆÁÊÌ>] ÐÁËÅÔ1 ÐÁËÅÔ2 ... ÐÁËÅÔN\n"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <ÆÁÊÌ>] ÐÁËÅÔ1 ÐÁËÅÔ2 ... ÐÁËÅÔN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1308,270 +1386,229 @@ msgid ""
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ÆÁÊÌ>]\n"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr "   ÷ÓÅ ÒÅÖÉÍÙ ÐÏÄÄÅÒÖÉ×ÁÀÔ ÓÌÅÄÕÀÝÉÅ ÁÒÇÕÍÅÎÔÙ:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<ÉÍÑ> <ÐÏÄÓÔÁÎÏ×ËÁ>'"
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<ÉÍÑ>+'       "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <ËÏÍÁÎÄÁ>      "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "÷ÍÅÓÔÏ ÎÉÈ ÉÓÐÏÌØÚÕÊÔÅ -e ÉÌÉ --erase.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr "   --dbpath <ËÁÔÁÌÏÇ>     "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr "   --root <ËÁÔÁÌÏÇ>       "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "  õÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ É ÚÁÐÒÏÓ (Ó -p) ÄÏÐÕÓËÁÀÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ftp URL "
 "×ÍÅÓÔÏ"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr "   ÉÍÅÎ ÆÁÊÌÏ× Á ÔÁËÖÅ ÓÌÅÄÕÀÝÉÅ ÏÐÃÉÉ:"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr "     --ftpproxy <ÁÄÒÅÓ>   "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <ÐÏÒÔ>    "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr "     --httpproxy <ÁÄÒÅÓ>  "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr "      --httpport <ÐÏÒÔ>    "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr "      ïÐÃÉÉ ÓÐÅÃÉÆÉËÁÃÉÉ ÐÁËÅÔÁ:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ×ÓÅ ÐÁËÅÔÙ"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr "        -f <ÆÁÊÌ>+        "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ <ÆÁÊÌ>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr "        -p <ÆÁÊÌ ÐÁËÅÔÁ>+ "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ (ÎÅÕÓÔÁÎÏ×ÌÅÎÎÙÊ) ÐÁËÅÔ <ÆÁÊÌ ÐÁËÅÔÁ>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <ÐÁËÅÔ>"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÁÍÉ ÎÁ ÐÁËÅÔ <ÐÁËÅÔ>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr "     --whatprovides <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr "     --whatrequires <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <qfmt>"
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr "      ïÐÃÉÉ ×ÙÂÏÒÁ ÉÎÆÏÒÍÁÃÉÉ:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr "ÐÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÅ ÐÁËÅÔÏÍ"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr "ÐÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÐÁËÅÔÁ"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr "×Ù×ÅÓÔÉ ÒÁÚÎÏÏÂÒÁÚÎÙÅ [ÄÅ]ÉÎÓÔÁÌÌÑÃÉÏÎÎÙÅ ÓËÒÉÐÔÙ"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr "ÐÏËÁÚÁÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÙ, ÓÏÄÅÒÖÁÝÉÅÓÑ × ÐÁËÅÔÅ"
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁÐÏ×"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr "    --install <ÆÁÊÌ ÐÁËÅÔÁ>"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr "    -i <ÆÁÊÌ ÐÁËÅÔÁ>      "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <ÐÕÔØ>"
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr "ÐÒÏÐÕÓÔÉÔØ ÆÁÊÌÙ × ÐÕÔÉ <ÐÕÔØ>"
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ËÁËÉÈ-ÌÉÂÏ ÕÓÔÁÎÏ×ÏÞÎÙÈ ÓËÒÉÐÔÏ×"
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÏ×, ×Ú×ÅÄÅÎÎÙÈ ÎÁ ÜÔÏÔ ÐÁËÅÔ"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <ËÁÔÁÌÏÇ>  "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <oldpath>=<newpath>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <ÆÁÊÌ ÐÁËÅÔÁ>"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr "    -U <ÆÁÊÌ ÐÁËÅÔÁ>      "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr "    --erase <ÐÁËÅÔ>  "
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<stage> <spec>      "
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr "    -t<stage> <tarball>   "
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr "ÓÏÚÄÁÔØ ÔÏÌØËÏ src rpm"
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr "     --buildroot <ËÁÔÁÌÏÇ>"
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr "     --target=<ÐÌÁÔÆÏÒÍÁ>+"
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr "   --rebuild <src_pkg>    "
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr "   --recompile <src_pkg>  "
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr "   --resign <pkg>+      "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr "   --addsign <pkg>+       "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr "   --checksig <pkg>+"
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr "   -K <pkg>+             "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr "ÓÏÚÄÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ (ÎÅ ÏÂÑÚÁÔÅÌØÎÏ)"
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr "ÐÅÒÅÉÎÄÅËÓÉÒÏ×ÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "÷ÍÅÓÔÏ ÎÉÈ ÉÓÐÏÌØÚÕÊÔÅ -e ÉÌÉ --erase.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "ÏÐÃÉÑ --dbpath ÚÁÄÁÎÁ ÄÌÑ ÏÐÅÒÁÃÉÉ, ÎÅ ÉÓÐÏÌØÚÕÀÝÅÊ ÂÁÚÕ ÄÁÎÎÙÈ"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 "ÏÐÃÉÑ --notriggers ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ÐÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ "
 "ÐÁËÅÔÁ"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÅÒÅÓÂÏÒËÉ"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "ÎÅ ÚÁÄÁÎ spec-ÆÁÊÌ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
 
@@ -2833,108 +2870,153 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr "buildroot ÕÖÅ ÕËÁÚÁÎ"
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%prep ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "prep (ÓÅËÃÉÑ %prep, ÒÁÚ×ÅÒÎÕÔØ ÉÓÈÏÄÎÉËÉ É ÎÁÌÏÖÉÔØ ÚÁÐÌÁÔÙ)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
-msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%build ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
+msgstr ""
+
+#: lib/poptBT.c:124
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <specfile>"
+msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%prep ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:127
+#, fuzzy
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%install ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÒÁÚÄÅÌ %%files ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:133
+#, fuzzy
+msgid "build source and binary packages from <specfile>"
 msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ É Ä×ÏÉÞÎÙÊ ÐÁËÅÔÙ ÐÏ ÆÁÊÌÕ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:136
+#, fuzzy
+msgid "build binary package only from <specfile>"
 msgstr "ÓÏÂÒÁÔØ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ÐÏ ÆÁÊÌÕ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:139
+#, fuzzy
+msgid "build source package only from <specfile>"
 msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÐÏ ÆÁÊÌÕ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%prep ÉÚ ÁÒÈÉ×Á tar"
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "prep (ÓÅËÃÉÑ %prep, ÒÁÚ×ÅÒÎÕÔØ ÉÓÈÏÄÎÉËÉ É ÎÁÌÏÖÉÔØ ÚÁÐÌÁÔÙ)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
-msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%build ÉÚ ÁÒÈÉ×Á tar"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
+msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <tarball>"
+msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%prep ÉÚ ÁÒÈÉ×Á tar"
+
+#: lib/poptBT.c:149
+#, fuzzy
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%install ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÓÅËÃÉÀ %%files ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:155
+#, fuzzy
+msgid "build source and binary packages from <tarball>"
 msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ É Ä×ÏÉÞÎÙÊ ÐÁËÅÔÙ ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
 msgstr "ÓÏÂÒÁÔØ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
 msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+#, fuzzy
+msgid "build binary package from <source package>"
 msgstr "ÓÏÂÒÁÔØ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ÉÚ ÉÓÈÏÄÎÏÇÏ ÐÁËÅÔÁ"
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "ÎÅÔ ÐÁËÅÔÏ×\n"
+
+#: lib/poptBT.c:168
+#, fuzzy
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%install ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÉÔØ build root"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr "ÎÅ ×ÙÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁÐÏ× ÓÂÏÒËÉ"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:187
+#, fuzzy
+msgid "do not accept i18N msgstr's from specfile"
 msgstr "ÎÅ ÐÒÉÎÉÍÁÔØ ÓÔÒÏË I18N ÉÚ spec-ÆÁÊÌÁ"
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr "ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÉÔØ ÃÅÌÅ×ÕÀ ÐÌÁÔÆÏÒÍÕ"
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+#, fuzzy
+msgid "lookup i18N strings in specfile catalog"
 msgstr "ÉÓËÁÔØ ÓÔÒÏËÉ I18N × ËÁÔÁÌÏÇÅ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+#, fuzzy
+msgid "query/verify package(s) owning file"
 msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔ, ËÏÔÏÒÏÍÕ ÐÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ"
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+#, fuzzy
+msgid "query/verify package(s) in group"
 msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ × ÇÒÕÐÐÅ"
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+#, fuzzy
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "ÚÁÐÒÏÓÉÔØ/ÐÒÏ×ÅÒÉÔØ ÆÁÊÌ ÐÁËÅÔÁ"
 
 #: lib/poptQV.c:76
@@ -2949,8 +3031,13 @@ msgstr "ÏÔÏÂÒÁÚÉÔØ ÉÚ×ÅÓÔÎÙÅ ËÌÀÞÉ ÚÁÐÒÏÓÁ"
 msgid "query a spec file"
 msgstr "ÚÁÐÒÏÓÉÔØ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+#, fuzzy
+msgid "query the package(s) triggered by the package"
 msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉÐÔÁÍÉ ÎÁ ÐÁËÅÔ"
 
 #: lib/poptQV.c:86
@@ -2962,42 +3049,44 @@ msgid "rpm verify mode (legacy)"
 msgstr "ÒÅÖÉÍ ÐÒÏ×ÅÒËÉ rpm (ÓÔÁÒÙÊ)"
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ"
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ"
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "ÎÁÊÔÉ/ÐÒÏ×ÅÒÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ËÏÎÆÉÇÕÒÁÃÉÉ"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr "ÐÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr "ÐÏËÁÚÁÔØ ÏÓÎÏ×ÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr "ÐÏËÁÚÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ ÓÌÅÄÕÀÝÉÊ ÆÏÒÍÁÔ ÚÁÐÒÏÓÁ"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr "ÚÁÍÅÎÉÔØ ÓÅËÃÉÉ i18n × ÆÁÊÌÅ ÓÐÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÐÅÒÅÞÉÓÌÅÎÎÙÈ ÆÁÊÌÏ×"
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr "ÐÏËÁÚÁÔØ ÄÅÔÁÌØÎÙÊ ÓÐÉÓÏË ÆÁÊÌÏ×"
 
@@ -3891,24 +3980,29 @@ msgstr "×ÙÐÏÌÎÑÅÔÓÑ ÓËÒÉÐÔ postuninstall (ÅÓÌÉ ÅÓÔØ)\n"
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓËÒÉÐÔÁ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr "ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÁ"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "ÎÅ ÉÓÐÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁÐÏ×"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr "× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÄÏÌÖÎÏ ÂÙÔØ)"
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr "× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕÐÐ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÄÏÌÖÎÏ ÂÙÔØ)"
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s\n"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
@@ -4117,6 +4211,74 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+#~ "<ÆÁÊÌ>]\n"
+
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=platform1[,platform2...]]"
+
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] [--rmspec] specfile"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       %s {--rmsource} [--rcfile <ÆÁÊÌ>] [-v] specfile\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--rebuild} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--recompile} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
+
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "       %s {--freshen -F} ÆÁÊÌ1.rpm ... ÆÁÊÌN.rpm\n"
+
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<stage> <spec>      "
+
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -t<stage> <tarball>   "
+
+#~ msgid "package src rpm only"
+#~ msgstr "ÓÏÚÄÁÔØ ÔÏÌØËÏ src rpm"
+
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "     --buildroot <ËÁÔÁÌÏÇ>"
+
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "     --target=<ÐÌÁÔÆÏÒÍÁ>+"
+
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "   --rebuild <src_pkg>    "
+
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "   --recompile <src_pkg>  "
+
+#~ msgid "build through %%build stage from spec file"
+#~ msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%build ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ"
+
+#~ msgid "build through %%build stage from tar ball"
+#~ msgstr "×ÙÐÏÌÎÉÔØ ÐÏ ÓÔÁÄÉÀ %%build ÉÚ ÁÒÈÉ×Á tar"
+
+#~ msgid "query the packages which require a capability"
+#~ msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ, ÔÒÅÂÕÀÝÉÅ ÓÅÒ×ÉÓ"
+
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "ÚÁÐÒÏÓÉÔØ ÐÁËÅÔÙ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÉÅ ÓÅÒ×ÉÓ"
+
 #~ msgid "exec failed!\n"
 #~ msgstr "ÏÛÉÂËÁ ÚÁÐÕÓËÁ!\n"
 
diff --git a/po/sk.po b/po/sk.po
index 50c00aa41..afeaa8412 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -24,64 +24,64 @@ msgstr "nevyrie¹ené závislosti:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nie je mo¾né otvori» spec súbor: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Otvorenie rúry pre tar zlyhalo: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Nie je mo¾né preèíta» spec súbor z %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Nie je mo¾né premenova» %s na %s: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "nepodarilo sa zisti» stav %s: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Súbor nie je obyèajný súbor: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s zrejme nie je RPM balík\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, fuzzy, c-format
 msgid "Building target platforms: %s\n"
 msgstr "predefinova» cieµovú platformu"
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "vyhµadáva sa balík %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzia %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Program mô¾e by» voµne redistribuovaný v súlade s podmienkami GNU GPL"
@@ -105,13 +105,13 @@ msgid ""
 msgstr ""
 "          rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                           [--replacepkgs] [--replacefiles] [--root "
 "<adresár>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--noscripts]"
@@ -123,36 +123,36 @@ msgstr ""
 "                           [--rcfile <súbor>] [--ignorearch] [--dbpath "
 "<adresár>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                           [--prefix <adresár>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                           [--ftpproxy <poèítaè>] [--ftpport <port>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                           [--httproxy <poèítaè>] [--httpport <port>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                           [--noorder] [--relocate stará_cesta=nová_cesta]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                           [--badreloc] [--notriggers] [--excludepath <path>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                           [--ignoresize] súbor1.rpm ... súborN.rpm"
 
@@ -162,7 +162,7 @@ msgid ""
 msgstr ""
 "          rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                           [--oldpackage] [--root <adresár>] [--noscripts]"
@@ -173,7 +173,7 @@ msgid ""
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--rcfile <súbor>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -184,23 +184,23 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                           [--httproxy <poèítaè>] [--httpport <port>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                           [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                           [--noorder] [--relocate stará_cesta=nová_cesta]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                           [--badreloc] [--excludepath <path>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                           súbor1.rpm ... súborN.rpm"
 
@@ -213,24 +213,24 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                           [--scripts] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 "                           [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                           [--nomd5] [ciele]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                           [--ftpport <port>] [--provides] [--triggers] "
 "[--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 "                           [--changelog] [--dbpath <adresár>] [targets]"
@@ -240,14 +240,14 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "          rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                           [--dbpath <adresár>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                           [--nomd5] [ciele]"
 
@@ -270,12 +270,12 @@ msgstr ""
 "          rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
 "<súbor>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 "                           [--dbpath <adresár>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                           [--justdb] [--notriggers] balík1 ... balíkN"
@@ -295,7 +295,7 @@ msgstr ""
 "          rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<súbor>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                              balík1 ... balíkN"
 
@@ -307,16 +307,16 @@ msgstr "          rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
 msgid "       rpm {--querytags}"
 msgstr "          rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "pou¾itie:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "vypísa» túto správu"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "vypísa» verziu pou¾ívaného rpm"
 
@@ -329,7 +329,7 @@ msgstr "   v¹etky re¾imy podporujú nasledovné argumenty:"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr "vypísa» verziu pou¾ívaného rpm"
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <príkaz>       "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "posla» ¹tandardný výstup do <príkazu>"
 
@@ -360,15 +360,15 @@ msgstr "      --rcfile <file>     "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "pou¾i» <súbor> namiesto /etc/rpmrc a $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "o nieèo popisnej¹í re¾im"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "veµmi popisný re¾im (pre odlaïovanie)"
 
@@ -385,7 +385,7 @@ msgstr "   namiesto názvov súborov, ako aj nasledujúce voµby:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <poèítaè>"
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "názov poèítaèa alebo IP adresa ftp proxy"
 
@@ -393,7 +393,7 @@ msgstr "názov poèítaèa alebo IP adresa ftp proxy"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "èíslo portu ftp servera (alebo proxy)"
 
@@ -402,7 +402,7 @@ msgstr "èíslo portu ftp servera (alebo proxy)"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <poèítaè>"
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "názov poèítaèa alebo IP adresa http proxy"
 
@@ -411,11 +411,11 @@ msgstr "názov poèítaèa alebo IP adresa http proxy"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "èíslo portu http servera (alebo proxy)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "re¾im otázok"
 
@@ -423,7 +423,7 @@ msgstr "re¾im otázok"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <dir>      "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "pou¾i» <adresár> ako adresár pre databázu"
 
@@ -431,7 +431,7 @@ msgstr "pou¾i» <adresár> ako adresár pre databázu"
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "pou¾i» <qfmt> ako hlavièkový formát (implikuje -i)"
@@ -440,7 +440,7 @@ msgstr "pou¾i» <qfmt> ako hlavièkový formát (implikuje -i)"
 msgid "      --root <dir>        "
 msgstr "      --root <dir>        "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne"
 
@@ -496,31 +496,31 @@ msgstr "opýta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
 msgid "      Information selection options:"
 msgstr "      Voµby pre výber po¾adovanej informácie:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "zobrazi» informácie o balíku"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "zobrazi» históriu zmien balíka"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "zobrazi» zoznam súborov balíka"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "zobrazi» stavy súborov (implikuje -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "zobrazi» len súbory obsahujúce dokumentáciu (implikuje -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "zobrazi» iba konfiguraèné súbory (implikuje -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -544,7 +544,7 @@ msgstr "vypísa» rôzne [od]in¹talaèné skripty"
 msgid "show the trigger scripts contained in the package"
 msgstr "zobrazi» spú¹»acie skripty obsiahnuté v balíku"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -552,19 +552,20 @@ msgstr ""
 "overi» in¹taláciu balíka s pou¾itím rovnakých volieb ¹pecifikácia balíka ako "
 "pre -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "neoverova» závislosti balíka"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "neoverova» md5 kontrolné súèty súborov"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "neoverova» atribúty súborov"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "vypísa» príznaky, ktoré mô¾u by» pou¾ité vo formáte otázky"
 
@@ -576,7 +577,7 @@ msgstr "    --install <súbor_balíku>"
 msgid "    -i <packagefile>      "
 msgstr "    -i <súbor_balíku>      "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "in¹talova» balík"
 
@@ -592,11 +593,11 @@ msgstr "vynecha» súbory v ceste <cesta>"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "presunú» súbory zo <starej_cesty> do <novej_cesty>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "balík %s nie je nain¹talovaný\n"
@@ -605,49 +606,49 @@ msgstr "balík %s nie je nain¹talovaný\n"
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <adresár>  "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "presunú» balík do <adresára>, pokiaµ to balík povoµuje"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "nein¹talova» dokumentáciu"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skratka pre --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "vypisova» znaèky poèas in¹talácie balíka (vhodné s -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "in¹talova» v¹etky súbory vrátane konfiguraèných súborov, ktoré by inak mohli "
 "by» vynechané"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "neoverova» architektúru balíka"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "pred in¹taláciou nekontrolova» dostupné miesto na disku"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "neoverova» operaèný systém balíka"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "in¹talova» dokumentáciu"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "aktualizova» databázu bez zmeny súborového systému"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nemeni» poradie balíkov kvôli vyrie¹eniu závislostí"
 
@@ -655,23 +656,23 @@ msgstr "nemeni» poradie balíkov kvôli vyrie¹eniu závislostí"
 msgid "don't execute any installation scripts"
 msgstr "nevykona» ¾iadne in¹talaèné skripty"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "vypisova» percentá poèas in¹talácie balíka"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "in¹talova» aj pokiaµ balík prepí¹e in¹talované súbory"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "prein¹talova», pokiaµ u¾ balík existuje"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né"
 
@@ -683,11 +684,11 @@ msgstr "    --upgrade <súbor_balíka>"
 msgid "    -U <packagefile>      "
 msgstr "    -U <súbor_balíka>     "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "aktualizova» balík (rovnaké voµby ako --install, a k tomu)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -699,11 +700,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <package>"
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "odin¹talova» balík"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -711,7 +712,7 @@ msgstr ""
 "odin¹talova» v¹etky balíky urèené <balíkom> (inak je chybou, pokiaµ <balík> "
 "¹pecifikuje viac ako jeden balík)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom"
 
@@ -723,54 +724,54 @@ msgstr "    -b<etapa> <spec>      "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etapa> <tar_súbor> "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "zostavi» balík, kde <etapa> je jedna z:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "príprava (rozbali» zdrojové súbory a aplikova» záplaty)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrola zoznamu (vykona» niektoré zbe¾né kontroly sekcie %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompilácia (príprava a kompilácia)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "in¹talácia (príprava, kompilácia, in¹talácia)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "binárny balík (príprava, kompilácia, in¹talácia, zabalenie)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "binárny a zdrojový balík (príprava, kompilácia, in¹talácia, zabalenie)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskoèi» priamo k urèenej etape (iba pre c, i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "po ukonèení odstráni» adresár, v ktorom sa balík zostavoval"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr "vytvori» PGP/GPG podpis"
 
@@ -778,7 +779,7 @@ msgstr "vytvori» PGP/GPG podpis"
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <adresár>   "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "pou¾i» <adresár> pre zostavenie balíka"
 
@@ -786,11 +787,11 @@ msgstr "pou¾i» <adresár> pre zostavenie balíka"
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "vytvori» balíky pre ciele platforma1...platformaN."
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "nevykona» ¾iadne etapy"
 
@@ -806,7 +807,7 @@ msgstr "nastavi» kontrolu èasu na <sekúnd> sekúnd (0 pre deaktiváciu)"
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <zdroj_balík>"
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -818,7 +819,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <src_pkg> "
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "ako --rebuild, ale nezostavi» ¾iadny balík"
 
@@ -826,7 +827,7 @@ msgstr "ako --rebuild, ale nezostavi» ¾iadny balík"
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <balík>+     "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "podpísa» balík (znièi» aktuálny podpis)"
 
@@ -834,7 +835,7 @@ msgstr "podpísa» balík (znièi» aktuálny podpis)"
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <balík>+    "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "prida» podpis balíku"
 
@@ -848,19 +849,19 @@ msgstr "    --checksig <balík>+   "
 msgid "    -K <pkg>+             "
 msgstr "    --resign <balík>+     "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "overi» podpis balíka"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "vynecha» akékoµvek PGP podpisy"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr "vynecha» akékoµvek GPG podpisy"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "vynecha» akékoµvek MD5 podpisy"
 
@@ -872,7 +873,7 @@ msgstr "uisti» sa, ¾e existuje platná databáza"
 msgid "rebuild database from existing database"
 msgstr "znovu vytvori» databázu z existujúcej"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -880,7 +881,7 @@ msgstr ""
 "nastavi» prístupové práva súborov podµa údajov v databáze balíkov s pou¾itím "
 "rovnakých volieb ¹pecifikácia balíka ako pre -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -889,37 +890,37 @@ msgstr ""
 "pou¾itím rovnakých volieb ¹pecifikácia balíka ako pre -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "mô¾e by» pou¾itý iba jeden hlavný re¾im"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u a --uninstall sú zastaralé a u¾ nefungujú.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "presunutia musia zaèína» znakom /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "presunutia musia obsahova» znak ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "presunutia musia ma» za znakom = znak /"
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musia zaèína» znakom /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -927,110 +928,110 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "naraz mô¾e by» vykonaný jeden typ otázky alebo overenia"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neoèakávaný zdroj pre otázku"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neoèakávaný zdroj pre otázku"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "neoèakávaný zdroj pre otázku"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "iba in¹talácia, aktualizácia a odstránenie zdrojov mô¾u by» vynútené"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "súbory mô¾u by» presunuté iba poèas inètalácie balíka"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "mo¾e by» pou¾itá iba jedna z volieb --prefix a --relocate"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath mô¾u by» pou¾ité iba poèas in¹talácie nových "
 "balíkov"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mô¾e by» pou¾itý iba poèas in¹talácie nových balíkov"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia zaèína» znakom /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mô¾e by» pou¾itý iba poèas in¹talácie balíka"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "mô¾e by» pou¾itá iba jedna voµba z --excludedocs a --includedocs"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mô¾e by» pou¾ité iba poèas odstránenia balíkov"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1046,7 +1047,7 @@ msgstr ""
 "--notriggers mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo "
 "overenia balíka"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1055,7 +1056,7 @@ msgstr ""
 "--nodeps mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo overenia "
 "balíka"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1063,7 +1064,7 @@ msgstr ""
 "--test mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo zostavenia "
 "balíka"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1071,98 +1072,98 @@ msgstr ""
 "--root (-r) mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka, "
 "otázky alebo znovuzostavenia databázy"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia zaèína» znakom /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage mô¾e by» pou¾íté iba poèas aktualizácie"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp mô¾e by» pou¾íté iba poèas overenia podpisu"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg mô¾e by» pou¾íté iba poèas overenia podpisu"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 mô¾e by» pou¾íté iba poèas overenia podpisu alebo balíka"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "nie je mo¾né pracova» so súborom %s\n"
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr "pgp nebolo nájdené: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "neoèakávané argumenty pre --querytags"
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "neboli zadané ¾iadne balíky pre overenie podpisu"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "neboli zadané ¾iadne balíky na podpis"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "neboli zadané ¾iadne balíky pre odin¹talovanie"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "neboli zadané ¾iadne argumenty pre otázku"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "neboli zadané ¾iadne argumenty pre overenie"
 
@@ -1184,50 +1185,172 @@ msgstr "chyba pri èítaní hlavièky balíka\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "nie je mo¾né otvori» súbor %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "vypísa» verziu pou¾ívaného rpm"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "znovu vytvori» databázu z existujúcej"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "nájdených %d balíkov\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+#, fuzzy
+msgid "skip files with leading component <path> "
+msgstr "vynecha» súbory v ceste <cesta>"
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "balík %s nie je nain¹talovaný\n"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <súbor_balíku>+"
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "nevykona» ¾iadne etapy"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "      --relocate <stará_cesta>=<nová_cesta>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "    --upgrade <súbor_balíka>"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+#, fuzzy
+msgid "Signature options:"
+msgstr "Veµkos» podpisu:   %d\n"
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "pou¾itie: rpm {--help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "          rpm {--initdb}   [--dbpath <adresár>]"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "          rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "          rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
@@ -1235,14 +1358,14 @@ msgstr ""
 "                           [--rcfile <súbor>] [--ignorearch] [--dbpath "
 "<adresár>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--rcfile <súbor>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
@@ -1250,87 +1373,43 @@ msgstr ""
 "          rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
 "<súbor>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                           [--scripts] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "          rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "          rpm {--setperms} [-afpg] [cieµ]"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "          rpm {--setugids} [-afpg] [cieµ]"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"          rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<súbor>]"
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                           [--target=platform1[,platform2...]]"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                           [--rmsource] specsúbor"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "          rpm {--rmsource} [--rcfile <súbor>] [-v] specsúbor"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"          rpm {--rebuild}  [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"          rpm {--recompile} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "                           súbor1.rpm ... súborN.rpm"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "          rpm {--resign}   [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "          rpm {--addsign}  [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1339,318 +1418,268 @@ msgstr ""
 "          rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<súbor>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   v¹etky re¾imy podporujú nasledovné argumenty:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    --pipe <príkaz>       "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "vypísa» verziu pou¾ívaného rpm"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <príkaz>       "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "      --dbpath <dir>      "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "      --root <dir>        "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr "   in¹talácia, aktualizácia a otázky (s -p) umo¾òujú pou¾i» ftp URL"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   namiesto názvov súborov, ako aj nasledujúce voµby:"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "      --ftpproxy <poèítaè>"
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <port>    "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "      --httpproxy <poèítaè>"
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "      --httpport <port>   "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Voµby pre ¹pecifikáciu balíkov"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "opýta» sa na v¹etky balíky"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "        -f <súbor>+       "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "opýta» sa na balík vlastniaci <súbor>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "        -p <súbor_balíku>+"
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "opýta» sa (nenain¹talovaného) balíku <súbor_balíku>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <balík>"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "opýta» sa na balíky spustené balíkom <balík>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --whatprovides <schopnos»>"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "opýta» sa na balíky poskytujúce schopnos» <schopnos»>"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --whatrequires <schopnos»>"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "opýta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 #, fuzzy
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <qfmt>"
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Voµby pre výber po¾adovanej informácie:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "zobrazi» schopnosti poskytované balíkom"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "zobrazi» schopnosti poskytované balíkom"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "vypísa» rôzne [od]in¹talaèné skripty"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr "zobrazi» spú¹»acie skripty obsiahnuté v balíku"
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "nevykona» ¾iadne etapy"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "    --install <súbor_balíku>"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <súbor_balíku>      "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <cesta>"
 
-#: rpmqv.c:521
-#, fuzzy
-msgid "skip files with leading component <path> "
-msgstr "vynecha» súbory v ceste <cesta>"
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "nevykona» ¾iadne in¹talaèné skripty"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "nevykona» ¾iadne skripty spú¹»ané týmto balíkom"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <adresár>  "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <súbor_balíka>"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -U <súbor_balíka>     "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "    --erase <package>"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<etapa> <spec>      "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -t<etapa> <tar_súbor> "
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "balík nemá meno"
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "      --buildroot <adresár>   "
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "      --target=<platforma>+"
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    --rebuild <zdroj_balík>"
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    --recompile <src_pkg> "
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --resign <balík>+     "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --addsign <balík>+    "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <balík>+   "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    --resign <balík>+     "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "znovu vytvori» databázu z existujúcej"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath zadané pre operáciu nepou¾ívajúcu databázu"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
 
@@ -2912,120 +2941,151 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr "buildroot u¾ bol zadaný"
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "príprava (rozbali» zdrojové súbory a aplikova» záplaty)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "in¹taluje sa zdrojový balík\n"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "príprava (rozbali» zdrojové súbory a aplikova» záplaty)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
+
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
 
-#: lib/poptBT.c:137
+#: lib/poptBT.c:161
 #, fuzzy
-msgid "build source package from tar ball"
+msgid "build source package only from <tarball>"
 msgstr "zostavi» balík pre OS/architektúru <os>"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "binárny balík (príprava, kompilácia, in¹talácia, zabalenie)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "nájdených %d balíkov\n"
+
+#: lib/poptBT.c:168
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "in¹taluje sa zdrojový balík\n"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr "predefinova» adresár pre zostavenie balíka"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr "nevykona» ¾iadne etapy zostavenia"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:187
+#, fuzzy
+msgid "do not accept i18N msgstr's from specfile"
 msgstr "neakceptova» lokalizované re»azce zo spec-súboru"
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr "predefinova» cieµovú platformu"
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+#, fuzzy
+msgid "lookup i18N strings in specfile catalog"
 msgstr "pre preklad re»azcov pou¾i» katalóg správ spec-súborov"
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "opýta» sa na balík vlastniaci <súbor>"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "opýta» sa v¹etkých balíkov v skupine"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "opýta» sa súboru balíka"
 
 #: lib/poptQV.c:76
@@ -3041,8 +3101,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "opýta» sa spec súboru"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+#, fuzzy
+msgid "query the package(s) triggered by the package"
 msgstr "opýta» sa balíkov spustených balíkom"
 
 #: lib/poptQV.c:86
@@ -3056,44 +3121,46 @@ msgid "rpm verify mode (legacy)"
 msgstr "re¾im otázok"
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr "opýta» sa balíkov vy¾adujúcich schopnos»"
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "opýta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr "opýta» sa balíkov poskytujúcich schopnos»"
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "opýta» sa na balíky poskytujúce schopnos» <schopnos»>"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr "zobrazi» v¹etky konfiguraèné súbory"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr "zobrazi» v¹etky dokumentaèné súbory"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr "zobrazi» základné informácie o balíku"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr "zobrazi» súbory v balíku"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr "pou¾i» nasledovný formát otázky"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr "zobrazii» stav daných súborov"
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr "zobrazi» podrobný zoznam súborov balíka"
 
@@ -3961,29 +4028,34 @@ msgstr "vykonávajú sa postdein¹talaèné skripty (ak existujú)\n"
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "zobrazi» súbory v balíku"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "nevykona» ¾iadne etapy"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 "v balíku chýba tak meno pou¾ívateµa, ako aj zoznamy identifikácií (nemalo by "
 "sa nikdy sta»)"
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 "v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa "
 "nikdy sta»)"
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "chýbajúce    %s\n"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
@@ -4192,6 +4264,77 @@ msgstr "nepodarilo sa otvori» %s: %s"
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "          rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
+#~ "<súbor>]"
+
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                           [--target=platform1[,platform2...]]"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                           [--rmsource] specsúbor"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "          rpm {--rmsource} [--rcfile <súbor>] [-v] specsúbor"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "          rpm {--rebuild}  [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "          rpm {--recompile} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "                           súbor1.rpm ... súborN.rpm"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<etapa> <spec>      "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -t<etapa> <tar_súbor> "
+
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "balík nemá meno"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "      --buildroot <adresár>   "
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "      --target=<platforma>+"
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    --rebuild <zdroj_balík>"
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    --recompile <src_pkg> "
+
+#~ msgid "query the packages which require a capability"
+#~ msgstr "opýta» sa balíkov vy¾adujúcich schopnos»"
+
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "opýta» sa balíkov poskytujúcich schopnos»"
+
 #~ msgid "exec failed!\n"
 #~ msgstr "vykonanie zlyhalo!\n"
 
diff --git a/po/sl.po b/po/sl.po
index 114917fea..15f63f563 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.120 2000/12/30 19:01:30 jbj Exp $
+# $Id: sl.po,v 1.121 2001/01/01 23:14:50 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -28,64 +28,64 @@ msgstr "izdelava soodvisnosti je bila neuspe¹na:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Datoteke s specifikacijami %s ni mo¾no odpreti: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Povezava s programom tar je bila neuspe¹na: %m\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Neuspe¹no branje datoteke s specifikacijami iz %s"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Preimenovanje %s v %s je bilo neuspe¹no: %m"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "status %s ni na voljo: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Datoteka ni obièajna datoteka: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Ne ka¾e, da je %s datoteka s specifikacijami."
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM razlièica %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Ta program je dovoljeno razpeèevati pod pogoji navedenimi v GNU GPL."
@@ -109,12 +109,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <imenik>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -125,36 +125,36 @@ msgstr ""
 "                        [--rcfile <datoteka>] [--ignorearch] [--dbpath "
 "<imenik>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <imenik>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <raè.>] [--ftpport <vrata>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <raè.>] [--httpport <vrata>] "
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate starapot=novapot]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <pot>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] datoteka1.rpm ... datotekaN.rpm"
 
@@ -164,7 +164,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <imenik>] [--noscripts]"
 
@@ -174,7 +174,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -185,22 +185,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <raè.>] [--httpport <vrata>] "
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate stara_pot=nova_pot]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <pot>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        datoteka1.rpm ... datotekaN.rpm"
 
@@ -213,21 +213,21 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <imenik>] [targets]"
 
@@ -236,14 +236,14 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <imenik>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
@@ -264,11 +264,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <imenik>] [--noscripts] [--rcfile <datoteka>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <imenik>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] paket1 ... paketN"
@@ -288,7 +288,7 @@ msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<datoteka>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paket2"
 
@@ -300,16 +300,16 @@ msgstr "       rpm {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "to sporoèilo"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "razlièica rpm, ki jo uporabljate"
 
@@ -322,7 +322,7 @@ msgstr "   Vsi naèini podpirajo naslednje argumente:"
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<ime> <telo>'"
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr "definirajte makro <ime> z vrednostjo <telo>"
 
@@ -339,7 +339,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <ukaz>         "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "standardni izhod preusmerjen na <ukaz>"
 
@@ -352,15 +352,15 @@ msgstr "      --rcfile <datoteka> "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "uporabite <datoteka> namesto /etc/rpmrc in $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr "prika¾i konèni rpmrc in nastavitev makra"
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "z nekaj veè komentarja med potekom"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "z vsem komentarjem, ki je na voljo (za odpravo napak)"
 
@@ -378,7 +378,7 @@ msgstr "   navedete URL za FTP; poleg tega pa ¹e naslednje mo¾nosti:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <raè.>   "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "ime raèunalnika ali IP za zastopnika FTP"
 
@@ -386,7 +386,7 @@ msgstr "ime raèunalnika ali IP za zastopnika FTP"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <vrata>   "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "¹tevilka vrat za FTP na stre¾niku ali zastopniku"
 
@@ -395,7 +395,7 @@ msgstr "¹tevilka vrat za FTP na stre¾niku ali zastopniku"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <raè.>   "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "ime raèunalnika ali IP za posrednika HTTP"
 
@@ -404,11 +404,11 @@ msgstr "ime raèunalnika ali IP za posrednika HTTP"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <vrata>   "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "¹tevilka vrat za HTTP na stre¾niku ali posredniku"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "poizvedbeni naèin"
 
@@ -416,7 +416,7 @@ msgstr "poizvedbeni naèin"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <imenik>   "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "kot imenik za podatkovno zbirko uporabi <imenik>"
 
@@ -424,7 +424,7 @@ msgstr "kot imenik za podatkovno zbirko uporabi <imenik>"
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "uporabi <qfmt> kot obliko glave (nana¹a se na --info)"
@@ -433,7 +433,7 @@ msgstr "uporabi <qfmt> kot obliko glave (nana¹a se na --info)"
 msgid "      --root <dir>        "
 msgstr "      --root <imenik>     "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "uporabi <imenik> za korenski imenik"
 
@@ -489,31 +489,31 @@ msgstr "poizvedba po paketih, ki zahtevajo dano mo¾nost <mo¾>"
 msgid "      Information selection options:"
 msgstr "      Izbire izbora informacij:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "izpis informacij o paketu"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "izpis dnevnika sprememb paketa"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "izpis seznama datotek v paketu"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "prikaz stanja datotek (nana¹a se na -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "prikaz seznama datotek z dokumetacijo (nana¹a se na -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "prikaz seznama nastavitvenih datotek (privzema -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -537,25 +537,26 @@ msgstr "izpis razliènih (od)namestitvenih skriptov"
 msgid "show the trigger scripts contained in the package"
 msgstr "prikaz pro¾ilnih skriptov, ki jih paket vsebuje"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "namestitev paketa preverimo z enakimi izbirnimi doloèili kot -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "brez preverjanja nadzorne vsote md5"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "brez preverjanja prilastkov datotek"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "izpi¹i znaèke, ki pridejo v po¹tev pri poizvedbi"
 
@@ -567,7 +568,7 @@ msgstr "    --install <paket>      "
 msgid "    -i <packagefile>      "
 msgstr "    -i <paket>            "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "name¹èanje paketa"
 
@@ -583,11 +584,11 @@ msgstr "preskok datoteke v navedeni poti"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "prestavljanje datoteke iz stare poti v novo"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -595,48 +596,48 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <imenik>   "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "èe je mogoèe, bo paket prestavljen v imenik <imenik>"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "brez namestitve dokumentacije"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "okraj¹ava za --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "namestitev vseh datotek, vkljuèno z nastavitvenimi, ki so sicer izpu¹èene"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "brez preverjanja prostora na disku pred name¹èanjem"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "brez preverjanja operacijskega sistema paketa"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "namesti dokumentacijo"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "obnovi podatkovno zbirko, a ne spreminjaj datoteènega sistema"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
@@ -645,23 +646,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr "brez izvajanja skriptov, ki jih po¾ene ta paket"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "izpis odstotkov med namestitvijo"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èene datoteke"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "ponovno namesti, èe paket ¾e obstaja"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "ne namesti, a ugotovi, èe bi delovalo"
 
@@ -673,11 +674,11 @@ msgstr "    --upgrade <paket>      "
 msgid "    -U <packagefile>      "
 msgstr "    -U <paket>            "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "nadgradi paket (iste izbire kot --install in ¹e:)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -689,11 +690,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <paket>   "
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "izbri¹i (odstrani) paket"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -701,7 +702,7 @@ msgstr ""
 "odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z "
 "napako, èe paket <paket> doloèa veè paketov)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "brez izvajanja skriptov paketa"
 
@@ -713,55 +714,55 @@ msgstr "    -b<stopnja> <spec>    "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<stopnja> <arhiv tar>"
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "zgradi paket, èe je <stopnja> karkoli od:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "preverjanje (povr¹no preverjanje %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "prevod (priprava in prevajanje)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "namestitev (pripava, prevajanje, namestitev)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "prevedeni paket (priprava, prevajanje, namestitev, izgradnja paketa)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "prevedeni in izvorni paket (priprava, prevajanje, namestitev, izgradnja "
 "paketa)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskok naravnost na doloèeno stopnjo (samo za c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "po zakljuèku drevo imenikov v katerih smo pakete gradili odstrani"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr "po zakljuèku naj se izvorna koda izbri¹e"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "po zakljuèku naj se datoteka s specifikacijami izbri¹e"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr "izdelava podpisa PGP/GPG"
 
@@ -769,7 +770,7 @@ msgstr "izdelava podpisa PGP/GPG"
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <imenik>"
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "<imenik> naj bo korenski imenik pri izgradnji"
 
@@ -777,11 +778,11 @@ msgstr "<imenik> naj bo korenski imenik pri izgradnji"
 msgid "      --target=<platform>+"
 msgstr "      --target=<s.okolje>+"
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "izgradi pakete za navedena ciljna strojna okolja"
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
@@ -797,7 +798,7 @@ msgstr "najveèji dopustni èas izgradnje paketa (0 brez omejitev)"
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <izv.paket> "
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -809,7 +810,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <izv.pak.>"
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "kot --rebuild, a brez izgradnje kakr¹negakoli paketa"
 
@@ -817,7 +818,7 @@ msgstr "kot --rebuild, a brez izgradnje kakr¹negakoli paketa"
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <paket>+     "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
 
@@ -825,7 +826,7 @@ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <paket>+    "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "paketu(-om) dodaj podpis"
 
@@ -839,19 +840,19 @@ msgstr "    --checksig <paket>+"
 msgid "    -K <pkg>+             "
 msgstr "    -K <paket>+           "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "preveri podpis paketa(-ov)"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "preskoèi vse podpise PGP"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr "preskoèi vse podpise GPG"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "preskoèi vse podpise MD5"
 
@@ -863,7 +864,7 @@ msgstr "preveri, èe obstaja veljavna zbirka"
 msgid "rebuild database from existing database"
 msgstr "ponovno izgradi zbirko iz obstojeèe"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -871,7 +872,7 @@ msgstr ""
 "nastavitev dovoljenja za datoteke na vrednosti v paketu, z istimi izbirnimi "
 "doloèili kot pri -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -880,37 +881,37 @@ msgstr ""
 "izbirnimi doloèili kot pri -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "izbran sme biti le en glavni naèin"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u in --uninstall nista veè podprti izbiri in ne delujeta veè.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Namesto njiju uporabite -e ali --erase.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "premikanja se morajo zaèeti z /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "premikanja morajo vsebovati ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "premikanja morajo imeti /, ki mu sledi ="
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr "poti, ki niso obdelane, se morajo zaèeti z /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -918,106 +919,106 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo en tip poizvedbe/preverjanja je mo¾en naenkrat"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr "neprièakovane zastavice pri poizvedbi"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr "neprièakovana oblika poizvedbe"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "neprièakovan izvor poizvedbe"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "izbiri --prefix in --relocate se medsebojno izkljuèujeta"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix se sme uporabiti le pri namestitvi"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo zaèeti z /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "izbiri --excludedocs in --includedocs se medsebojno izkljuèujeta"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sme podan le ob namestitvi paketa"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sme biti podati le ob namestitvi paketa"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1033,7 +1034,7 @@ msgstr ""
 "--notriggers smemo biti podan le ob namestitvi, odstranitvi ali preverjanju "
 "paketa"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1041,14 +1042,14 @@ msgstr ""
 "--nodeps sme biti podan le ob izgradnji, vnovièni izgradnji, prevajanju, "
 "namestitvi, odstranitvi ali preverjanju paketa"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1056,97 +1057,97 @@ msgstr ""
 "--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
 "vnovièni izgradnji paketa"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo zaèeti z /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage sme biti podan le ob nadgradnji"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp sme biti podan le ob preverjanju podpisa"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg sme biti podati le ob preverjanju podpisa"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 sme biti podan le ob preverjanju podpisa ali paketa"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr "ni datotek, ki bi jih lahko podpisal\n"
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "dostop do datoteke %s ni mo¾en\n"
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr "pgp manjka: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspe¹no\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign sme biti podan le ob izgradnji paketa"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr "izvajanje je bilo neuspe¹no\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "neprièakovani argumenti za --querytags "
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "paketi za katere bi bilo potrebno preveriti podpis niso navedeni"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "pri poizvedbi paketov so podani odveèni argumenti"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr "pri preverjanju paketov so podani odveèni argumenti"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
@@ -1168,50 +1169,172 @@ msgstr "napaka pri branju glave paketa\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "ni mo¾no vnoviè odpreti (payload): %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "uporabljana razlièica rpm"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "ponovno izgradi zbirko iz obstojeèih glav"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "ni paketov\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+#, fuzzy
+msgid "skip files with leading component <path> "
+msgstr "preskok datotek v navedeni poti"
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "paket %s-%s-%s je ¾e name¹èen"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <paket>+       "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "brez izvajanja katerekoli stopen izgradnje"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "      --relocate <starapot>=<novapot>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "    --upgrade <paket>      "
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+#, fuzzy
+msgid "Signature options:"
+msgstr "Dol¾. podpisa : %d\n"
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Uporaba: %s {--help}\n"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <imenik>]\n"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]\n"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
@@ -1219,14 +1342,14 @@ msgstr ""
 "                        [--rcfile <datoteka>] [--ignorearch] [--dbpath "
 "<imenik>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
@@ -1234,87 +1357,43 @@ msgstr ""
 "       %s {--erase -e} [--root <imenik>] [--noscripts] [--rcfile "
 "<datoteka>]\n"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]\n"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [target]\n"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [target]\n"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
-"<datoteka>]\n"
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=okolje1[,okolje2...]]"
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] [--rmspec] datoteka_spec"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       %s {--rmsource} [--rcfile <datoteka>] [-v] datoteka_spec\n"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--rebuild} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm\n"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--recompile} [--rcfile <datoteka>] [-v] izvor1.rpm ... "
-"izvorN.rpm\n"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "       %s {--freshen -F} datoteka1.rpm ... datotekaN.rpm\n"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN\n"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1323,319 +1402,269 @@ msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<datoteka>]\n"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   Vsi naèini podpirajo naslednje argumente:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<ime> <telo>'"
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<ime>+'       "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "uporabljana razlièica rpm"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "   --pipe <ukaz>         "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Namesto njiju uporabite -e ali --erase.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "   --dbpath <imenik>   "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "   --root <imenik>     "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   Namestitev, obnova in poizvedba (z -p) omogoèata, da namesto imen datotek"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   navedemo URL za FTP; poleg tega pa ¹e naslednje mo¾nosti:"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "      --ftpproxy <raè.>   "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <vrata>   "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "      --httpproxy <raè.>   "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "      --httpport <vrata>   "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "  Mo¾nosti za doloèitev paketov:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "poizvedba/preverba po vseh paketih"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "     -f <datoteka>+    "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "poizvedba/preverba po paketu, ki vsebuje <datoteko>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "     -p <datotekapaketa>+  "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "poizvedba/preverba po (odstranjenem) paketu <datotekapaketa>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <pkg>  "
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "poizvedba po paketih, ki jih spro¾i paket <pkg>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --whatprovides <mo¾>"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "poizvedba po paketih, ki ponujajo dano zmo¾nost <mo¾>"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --whatrequires <mo¾>"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "poizvedba po paketih, ki potrebujejo dano zmo¾nost <mo¾>"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 #, fuzzy
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <qfmt>"
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Izbire izbora informacij:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "izpis mo¾nosti, ki jih nudi paket"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "izpis mo¾nosti, ki jih paket potrebuje"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "izpis razliènih (od)namestitvenih skriptov"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr "prikaz pro¾ilnih skriptov, ki jih paket vsebuje"
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "brez izvajanja katerekoli stopen izgradnje"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "    --install <paket>      "
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <paket>            "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <pot> "
 
-#: rpmqv.c:521
-#, fuzzy
-msgid "skip files with leading component <path> "
-msgstr "preskok datotek v navedeni poti"
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <imenik>   "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <paket>      "
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -U <paket>            "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "    --erase <paket>   "
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<stopnja> <spec>    "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -t<stopnja> <arhiv tar>"
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "paket vsebuje izvorno kodo"
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "      --buildroot <imenik>"
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "      --target=<s.okolje>+"
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    --rebuild <izv.paket> "
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    --recompile <izv.pak.>"
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --resign <paket>+     "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --addsign <paket>+    "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <paket>+   "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    --K <paket>+     "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr "nalaganje podatkovne zbirke (nepotrebno, zavr¾ena izbira)"
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "ponovno izgradi zbirko iz obstojeèih glav"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Namesto njiju uporabite -e ali --erase.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath podan, vendar, èeprav nepotreben"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovièno izgradnjo niso navedeni"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
@@ -2901,118 +2930,153 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr "buildroot je ¾e doloèen"
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr "izgradnja prek stopnje %%prep iz datoteke s specifikacijami"
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
-msgstr "izgradnja prek stopnje %%build iz datoteke s specifikacijami"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
+msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
-msgstr "izgradnja prek stopnje %%install iz datoteke s specifikacijami"
+#: lib/poptBT.c:124
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <specfile>"
+msgstr "izgradnja prek stopnje %%prep iz datoteke s specifikacijami"
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "izgradnja prek stopnje %%install iz datoteke s specifikacijami"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "preverjanje dela datoteke s specifikacijami %%files"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "izgradi izvorni in binarni paket iz datoteke s specifikacijami"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "izgradi binarni paket iz datoteke .spec"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "izgradi izvorni paket iz datoteke .spec"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr "paket izgradi prek stopnje %%prep iz arhiva tar"
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
-msgstr "paket izgradi prek stopnje %%build iz arhiva tar"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
+msgstr ""
+
+#: lib/poptBT.c:146
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <tarball>"
+msgstr "paket izgradi prek stopnje %%prep iz arhiva tar"
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:149
+#, fuzzy
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "paket izgradi prek stopnje %%install iz arhiva tar"
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
 msgstr "preverjanje dela %%files iz arhiva tar"
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "iz arhiva tar izgradi izvorni in binarni paket"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
 msgstr "iz arhiva tar izgradi binarni paket"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
 msgstr "iz arhiva tar izgradi izvorni paket"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "binarni paket izgradi iz izvornega"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "ni paketov\n"
+
+#: lib/poptBT.c:168
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "izgradnja prek stopnje %%install iz izvornega paketa"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr "brez upo¹tevanja vrhnjega imenika izgradnje"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr "brez izvajanja katerekoli od stopenj izgradnje"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:187
+#, fuzzy
+msgid "do not accept i18N msgstr's from specfile"
 msgstr "brez sprejemanja internacionaliziranih katalogov iz datoteke spec"
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr "po zakljuèku odstrani datoteko s specifikacijami"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr "brez upo¹tevanja strojnega okolja ciljnega sistema"
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+#, fuzzy
+msgid "lookup i18N strings in specfile catalog"
 msgstr "upo¹tevanje internacionalizirana sporoèila v katalogu spec"
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "poizvedba po paketu v skupini"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "poizvedba po paketu"
 
 #: lib/poptQV.c:76
@@ -3028,8 +3092,13 @@ msgstr "prika¾i znane znaèke za poizvedovanje"
 msgid "query a spec file"
 msgstr "poizvedba po datoteki spec"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+#, fuzzy
+msgid "query the package(s) triggered by the package"
 msgstr "poizvedba po paketih, ki jih spro¾i paket"
 
 #: lib/poptQV.c:86
@@ -3043,43 +3112,45 @@ msgid "rpm verify mode (legacy)"
 msgstr "poizvedbeni naèin (opu¹èen)"
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr "poizvedba po paketih, ki zahtevajo zmo¾nost"
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "poizvedba po paketih, ki potrebujejo dano zmo¾nost <mo¾>"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr "poizvedba po paketih, ki nudijo zmo¾nost"
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "poizvedba po paketih, ki ponujajo dano zmo¾nost <mo¾>"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr "izpis vseh dokumentacijske datoteke"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr "iznos osnovnih podatkov o datoteki"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr "izpis seznama datotek v paketu"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr "uporabi naslednjo obliko poizvedbe"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "zamenjava razdeljkov I18N z naslednjim katalogom"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr "izpis stanja seznama datotek"
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr "izpis ob¹irnega seznama datotek"
 
@@ -3971,26 +4042,31 @@ msgstr "poganjanje poodnamestitvenih skriptov (èe obstajajo)\n"
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "skript se ni uspe¹no izvedel"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "brez izvajanja katerekoli stopen izgradnje"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 "v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme zgoditi)"
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)"
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "manjka     %s\n"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
@@ -4199,6 +4275,83 @@ msgstr "neuspe¹no odpiranje %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
+#~ "<datoteka>]\n"
+
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=okolje1[,okolje2...]]"
+
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] [--rmspec] datoteka_spec"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       %s {--rmsource} [--rcfile <datoteka>] [-v] datoteka_spec\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--rebuild} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--recompile} [--rcfile <datoteka>] [-v] izvor1.rpm ... "
+#~ "izvorN.rpm\n"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "       %s {--freshen -F} datoteka1.rpm ... datotekaN.rpm\n"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<stopnja> <spec>    "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -t<stopnja> <arhiv tar>"
+
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "paket vsebuje izvorno kodo"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "      --buildroot <imenik>"
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "      --target=<s.okolje>+"
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    --rebuild <izv.paket> "
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    --recompile <izv.pak.>"
+
+#~ msgid "build through %%build stage from spec file"
+#~ msgstr "izgradnja prek stopnje %%build iz datoteke s specifikacijami"
+
+#~ msgid "build through %%build stage from tar ball"
+#~ msgstr "paket izgradi prek stopnje %%build iz arhiva tar"
+
+#~ msgid "query the packages which require a capability"
+#~ msgstr "poizvedba po paketih, ki zahtevajo zmo¾nost"
+
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "poizvedba po paketih, ki nudijo zmo¾nost"
+
 #~ msgid "exec failed!\n"
 #~ msgstr "zagon je bil neuspe¹en!\n"
 
diff --git a/po/sr.po b/po/sr.po
index 2aa1b0287..05606e037 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -22,63 +22,63 @@ msgstr "lo¹e meðuzavisnosti:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "neuspelo otvaranje %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s ne lièi na RPM paket\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s ne lièi na RPM paket\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "gre¹ka potrage za paketom %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU GPL"
@@ -101,11 +101,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -114,33 +114,33 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -169,21 +169,21 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
@@ -196,21 +196,21 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "\t\t\t   paket1 ...paketN"
@@ -219,12 +219,12 @@ msgstr "\t\t\t   paket1 ...paketN"
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -245,11 +245,11 @@ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "\t\t\t   paket1 ...paketN"
@@ -268,7 +268,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "\t\t\t   paket1 ...paketN"
 
@@ -280,16 +280,16 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "kori¹æenje:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "¹tampaj ovu poruku"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "napi¹i verziju rpm-a koja se koristi"
 
@@ -302,7 +302,7 @@ msgstr "   svi re¾imi podr¾avaju sledeæe argumente:"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -321,7 +321,7 @@ msgstr "napi¹i verziju rpm-a koja se koristi"
 msgid "    --pipe <cmd>          "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "po¹alji standardni izlaz u <komandu>"
 
@@ -334,15 +334,15 @@ msgstr "    -b<faza> <spec>\t "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "koristi <datoteku> umesto /etc/rpmrc i $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "budi malko prièljiviji"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "budi neverovatno prièljiv (zbog nala¾enja gre¹aka)"
 
@@ -361,7 +361,7 @@ msgstr "   na mestu imena datoteka kao i sledeæe opcije:\n"
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "ime hosta ili IP ftp proxy-ja"
 
@@ -369,7 +369,7 @@ msgstr "ime hosta ili IP ftp proxy-ja"
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "broj porta FTP servera (ili proxy)"
 
@@ -378,7 +378,7 @@ msgstr "broj porta FTP servera (ili proxy)"
 msgid "      --httpproxy <host>  "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "ime hosta ili IP ftp proxy-ja"
@@ -388,12 +388,12 @@ msgstr "ime hosta ili IP ftp proxy-ja"
 msgid "      --httpport <port>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "broj porta FTP servera (ili proxy)"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "re¾im upita"
 
@@ -402,7 +402,7 @@ msgstr "re¾im upita"
 msgid "      --dbpath <dir>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "koristi <dir> kao direktorijum baze podataka"
 
@@ -410,7 +410,7 @@ msgstr "koristi <dir> kao direktorijum baze podataka"
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "koristi s kao format zaglavlja (povlaèi -i)"
@@ -419,7 +419,7 @@ msgstr "koristi s kao format zaglavlja (povlaèi -i)"
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa"
 
@@ -481,31 +481,31 @@ msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 msgid "      Information selection options:"
 msgstr "      Opcije za selekciju informacije:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "prika¾i informacije o paketu"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "prika¾i dnevnik promene paketa"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "prika¾i listu datoteka u paketu"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "prika¾i stanja datoteka (povlaèi -i)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "prika¾i samo datoteke iz dokumentacije (povlaèi -i)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -529,7 +529,7 @@ msgstr "ispi¹i razne skriptove za [de]instalaciju"
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 #, fuzzy
 msgid ""
 "verify a package installation using the same same package specification "
@@ -537,19 +537,20 @@ msgid ""
 msgstr ""
 "proveri instalaciju paketa koristeæi iste opcije za odreðenje paketa kao i -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "nemoj proveravati md5 kontrolne sume datoteke"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "nemoj proveravati atribute datoteke"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "ispi¹i tag-ove koji mogu biti kori¹æeni u formatu upita"
 
@@ -563,7 +564,7 @@ msgstr "instaliraj paket"
 msgid "    -i <packagefile>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "instaliraj paket"
 
@@ -581,11 +582,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "paket %s nije instaliran\n"
@@ -594,48 +595,48 @@ msgstr "paket %s nije instaliran\n"
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "premesti paket u <dir>, ako se mo¾e premestiti"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "nemoj da instalira¹ dokumentaciju"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skraæenica za --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "pi¹i he¹-znak (#) kako odmièe instaliranje paketa (dobro doðe sa -v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaliraj sve datoteke, èak i konfiguracije koje bi inaèe bile preskoèene"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "nemoj proveravati operativni sistem za paket"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "instaliraj dokumentaciju"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "a¾uriraj bazu podataka, ali nemoj menjati fajl-sistem"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti"
@@ -644,23 +645,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr "nemoj izvr¹iti nijedan instalacioni skript"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "pi¹i procente instalacije paketa"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "instaliraj èak iako æe paket zameniti instalirane datoteke"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "ponovo instaliraj ako je paket veæ prisutan"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "nemoj instalirati, ali reci da li æe da radi ili ne"
 
@@ -673,11 +674,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "a¾uriraj paket (iste opcije kao --install, plus)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -688,11 +689,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "izbri¹i (deinstaliraj) paket"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -700,7 +701,7 @@ msgstr ""
 "ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se gre¹ka ako "
 "<paket> oznaèava vi¹e paketa)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "nemoj izvr¹iti nijedan skript iz paketa"
 
@@ -713,54 +714,54 @@ msgstr "    -b<faza> <spec>\t "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "napravi paket, gde je <faza> jedna od:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "provera liste (mala provera na %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompilacija (priprema i kompilacija)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "instalacija (priprema, kompilacija, instalacija)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "idi pravo do odreðene faze (samo za k,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "ukloni stablo direktorijuma po zavr¹etku"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "napravi PGP potpis"
@@ -770,7 +771,7 @@ msgstr "napravi PGP potpis"
 msgid "      --buildroot <dir>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 
@@ -778,11 +779,11 @@ msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
@@ -800,7 +801,7 @@ msgstr "postavi vremensku proveru na S sekundi (0 je deaktivira)"
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -812,7 +813,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "kao i --rebuild, samo nemoj praviti nikakav paket"
 
@@ -821,7 +822,7 @@ msgstr "kao i --rebuild, samo nemoj praviti nikakav paket"
 msgid "    --resign <pkg>+       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "potpi¹i paket (ukloni tekuæi potpis)"
 
@@ -830,7 +831,7 @@ msgstr "potpi¹i paket (ukloni tekuæi potpis)"
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "dodaj potpis u paket"
 
@@ -844,20 +845,20 @@ msgstr "    -b<faza> <spec>\t "
 msgid "    -K <pkg>+             "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "proveri potpis u paketu"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "preskoèi sve PGP potpise"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "preskoèi sve PGP potpise"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "preskoèi sve MD5 potpise"
 
@@ -869,7 +870,7 @@ msgstr "uveri se da postoji ispravna baza podataka"
 msgid "rebuild database from existing database"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -877,7 +878,7 @@ msgstr ""
 "postavi dozvole datoteke kao one u bazi podataka paketa koristeæi iste "
 "opcije za odreðenje datoteka kao i -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -886,38 +887,38 @@ msgstr ""
 "iste opcije za odreðenje datoteka kao i -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni re¾im mo¾e biti naveden"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u i --uninstall nisu vi¹e podr¾ani i ne rade vi¹e.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Koristite -e ili --erase.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "preme¹tanja moraju imati znak ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "preme¹tanja moraju imati / praæeno sa ="
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -925,110 +926,110 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo jedan tip upita/provere mo¾e biti uraðen odjednom"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neoèekivan izvor upita"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neoèekivan izvor upita"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "neoèekivan izvor upita"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "samo instalacija i a¾uriranje mogu biti forsirane"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "datoteke mogu biti preme¹tene samo tokom instalacije paketa"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate mo¾ete koristiti samo kad instalirate novi paket"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mo¾ete koristiti samo kod instalacije novog paketa"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju poèeti znakom /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "samo jedno mo¾ete da navedete: --excludedocs ili --includedocs"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mo¾ete koristiti samo kod brisanja paketa"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1044,7 +1045,7 @@ msgid ""
 msgstr ""
 "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1052,14 +1053,14 @@ msgid ""
 msgstr ""
 "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1067,102 +1068,102 @@ msgstr ""
 "--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili "
 "rekreiranja baze podataka"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju poèeti znakom /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage se mo¾e koristiti samo tokom a¾uriranja paketa"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp se mo¾e koristiti samo prilikom provere potpisa"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp se mo¾e koristiti samo prilikom provere potpisa"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nopgp se mo¾e koristiti samo kod provere potpisa ili paketa"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datoteka nije pronaðena na serveru"
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "neoèekivani argumenti za --querytags"
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "nedostaje paket za proveru potpisa"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "nedostaje paket za potpisivanje"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "neodstaje paket za deinstalaciju"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
@@ -1185,458 +1186,488 @@ msgstr "gre¹ka potrage za paketom %s\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "napi¹i verziju rpm-a koja se koristi"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "rekreiraj bazu podataka iz postojeæe baze"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "upit nad svim paketima"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "paket %s nije instaliran\n"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "    -b<faza> <spec>\t "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "nemoj izvr¹iti nijednu fazu"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "upit nad paketom koji ima <datoteku>"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "instaliraj paket"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "kori¹æenje: {rpm --help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
-
-#: rpmqv.c:350
-#, fuzzy
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "\trpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   svi re¾imi podr¾avaju sledeæe argumente:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "napi¹i verziju rpm-a koja se koristi"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Koristite -e ili --erase.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-ova"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   na mestu imena datoteka kao i sledeæe opcije:\n"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Opcije odrednice paketa:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "upit nad svim paketima"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "upit za (deinstaliran) paket <paketdatoteka>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Opcije za selekciju informacije:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "poka¾i koja svojstva donosi paket"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "poka¾i koja svojstva donosi paket"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "ispi¹i razne skriptove za [de]instalaciju"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "nemoj izvr¹iti nijednu fazu"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "instaliraj paket"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "nemoj izvr¹iti nijedan instalacioni skript"
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "upit nad paketom koji ima <datoteku>"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "instaliraj paket"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "instaliraj paket"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "paket nema imena"
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    -b<faza> <spec>\t "
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Koristite -e ili --erase.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
@@ -2906,122 +2937,151 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "instaliraj paket"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "upit nad paketom koji ima <datoteku>"
+
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/poptBT.c:137
+#: lib/poptBT.c:161
 #, fuzzy
-msgid "build source package from tar ball"
+msgid "build source package only from <tarball>"
 msgstr "napravi pakete za operativni sistem <os>"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid "<source package>"
+msgstr "upit nad svim paketima"
+
+#: lib/poptBT.c:168
+#, fuzzy
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "instaliraj paket"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 #, fuzzy
 msgid "override build root"
 msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "paket nema imena"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "upit nad svim paketima"
 
 #: lib/poptQV.c:76
@@ -3038,9 +3098,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "upit nad %s neuspeo\n"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
 #, fuzzy
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr "upit nad paketom koji ima <datoteku>"
 
 #: lib/poptQV.c:86
@@ -3055,49 +3119,49 @@ msgstr "re¾im upita"
 
 #: lib/poptQV.c:90
 #, fuzzy
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 
 #: lib/poptQV.c:92
 #, fuzzy
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all configuration files"
 msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instaliraj dokumentaciju"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "dump basic file information"
 msgstr "prika¾i informacije o paketu"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 #, fuzzy
 msgid "list files in package"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "use the following query format"
 msgstr "neoèekivan izvor upita"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "prika¾i listu datoteka u paketu"
@@ -3976,25 +4040,30 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "neuspelo izvr¹avanje skripta"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "instaliraj paket"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "nemoj izvr¹iti nijednu fazu"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "nedostaje { posle %"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: "
@@ -4214,6 +4283,76 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
+
+#, fuzzy
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "paket nema imena"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    -b<faza> <spec>\t "
+
+#, fuzzy
+#~ msgid "query the packages which require a capability"
+#~ msgstr "upit za pakete koji zahtevaju <i> svojstvo"
+
+#, fuzzy
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
+
+#, fuzzy
 #~ msgid "exec failed!\n"
 #~ msgstr "%s: Neuspelo otvaranje\n"
 
diff --git a/po/sv.po b/po/sv.po
index 7922995b0..b842d7206 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: 2000-10-09 22:31+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -23,64 +23,64 @@ msgstr "ouppfyllda byggberoenden:\n"
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan inte öppna spec-filen %s: %s\n"
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Kunde inte öppna \"tar\"-rör: %s\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Kunde inte läsa spec-fil från %s\n"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Kunde inte byta namn på %s till %s: %s\n"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "kunde inte ta status på %s: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Filen är inte en ordinär fil: %s\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Filen %s tycks inte vara en spec-fil.\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger målplattformar: %s\n"
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger för målet %s\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Den här programvaran kan distribueras fritt med hänsyn till GNU GPL"
@@ -103,12 +103,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <kat>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -118,32 +118,32 @@ msgid ""
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <kat>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <värd>] [--ftpport <port>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <värd>] [--httpport <port>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                  [--justdb] [--noorder] [--relocate gammalväg=nyväg]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <sökväg>]"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] fil1.rpm ... filN.rpm"
 
@@ -153,7 +153,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <kat>] [--noscripts]"
 
@@ -163,7 +163,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -173,22 +173,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <värd>] [--httpport <port>] "
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate gammalväg=nyväg]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <sökväg>] [--ignoresize]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        fil1.rpm ... filN.rpm"
 
@@ -200,19 +200,19 @@ msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <kat>] [mål]"
 
@@ -220,13 +220,13 @@ msgstr "                        [--changelog] [--dbpath <kat>] [mål]"
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <kat>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [mål]"
 
@@ -246,11 +246,11 @@ msgstr "       rpm {--freshen -F} fil1.rpm ... filN.rpm"
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr "       rpm {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <kat>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] paket1 ... paketN"
 
@@ -268,7 +268,7 @@ msgid ""
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paketN"
 
@@ -280,15 +280,15 @@ msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr "Användning:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "visa detta meddelande"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "visa vilken version av rpm som används"
 
@@ -300,7 +300,7 @@ msgstr "   Alla arbetssätt stödjer följande argument:"
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<namn> <kropp>'"
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr "definiera makrot <namn> som <kropp>"
 
@@ -316,7 +316,7 @@ msgstr "skriv ut expansionen av makrot <namn> på standard ut"
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <kommando>     "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "skicka stdut till <kommando>"
 
@@ -328,15 +328,15 @@ msgstr "      --rcfile <fil>      "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "använd <fil> istället för /etc/rpmrc och $HOME/.rpmrc"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr "visa slutliga rpmrc- och makrokonfigurationer"
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "var lite mer mångordig"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "var mycket mångordig (för felsökning)"
 
@@ -353,7 +353,7 @@ msgstr "   istället för filnamn, liksom följande flaggor:"
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <värd>   "
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "ftp-ombudets (proxy) värdnamn eller IP"
 
@@ -361,7 +361,7 @@ msgstr "ftp-ombudets (proxy) värdnamn eller IP"
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp-servers (eller ombuds (proxy)) portnummer"
 
@@ -369,7 +369,7 @@ msgstr "ftp-servers (eller ombuds (proxy)) portnummer"
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <värd>  "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr "http-ombudets värdnamn eller IP"
 
@@ -377,11 +377,11 @@ msgstr "http-ombudets värdnamn eller IP"
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr "http-servers (eller ombuds) portnummer"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "frågeläge"
 
@@ -389,7 +389,7 @@ msgstr "frågeläge"
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <kat>      "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "använd <kat> som katalog för databasen"
 
@@ -397,7 +397,7 @@ msgstr "använd <kat> som katalog för databasen"
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <ffmt>"
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "använd <ffmt> som huvudformat (medför --info)"
 
@@ -405,7 +405,7 @@ msgstr "använd <ffmt> som huvudformat (medför --info)"
 msgid "      --root <dir>        "
 msgstr "      --root <kat>        "
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "använd <kat> som toppkatalog"
 
@@ -461,31 +461,31 @@ msgstr "undersök paket som behöver <egenskap>"
 msgid "      Information selection options:"
 msgstr "      Flaggor för informationsval:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "visa paketinformation"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "visa paketets ändringslogg"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "visa paketets fillista"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "visa filers status (implicerar -l)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "visa enbart dokumentationsfiler (implicerar -l)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr "visa enbart konfigurationsfiler (implicerar -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -509,25 +509,26 @@ msgstr "visa de olika [av]installationsskripten"
 msgid "show the trigger scripts contained in the package"
 msgstr "visa utlösningsskripten i paketet"
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "verifiera ett pakets installation med samma urvalsflaggor som till -q"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "verifiera inte md5-kontrollsummor"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "verifiera inte filattribut"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "visa taggar som kan användas i frågeformat"
 
@@ -539,7 +540,7 @@ msgstr "    --install <paketfil>"
 msgid "    -i <packagefile>      "
 msgstr "    -i <paketfil>         "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "installera paket"
 
@@ -555,11 +556,11 @@ msgstr "hoppa över filer i <sökv>"
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <frånskv>=<tillskv>"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "flytta filer från <frånskv> till <tillskv>"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr "relokera filer i ej relokerbart paket"
 
@@ -567,50 +568,50 @@ msgstr "relokera filer i ej relokerbart paket"
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>  "
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "flytta paketet till <katalog>, om flyttbart"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "installera inte dokumentation"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "kortform för --replacepkgs --replacefiles"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "skriv ut brädgårdar allt eftersom paketet installeras (bra tillsammans med "
 "-v)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installera alla filer, även konfigurationer som annars kunde hoppats över"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "verifiera inte paketarkitektur"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr "kontrollera inte diskutrymme före installation"
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "verifiera inte paketets operativsystem"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "installera dokumentation"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "uppdatera databasen, men ändra inte filsystemet"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
 
@@ -618,23 +619,23 @@ msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
 msgid "don't execute any installation scripts"
 msgstr "kör inte installationsskript"
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr "kör inte utlösningsskript utlösta av detta paket"
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "skriv procent allt eftersom paketet installeras"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "installera även om paketet byter ut installerade filer"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "installera om ifall paketet redan är installerat"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
 
@@ -646,11 +647,11 @@ msgstr "    --upgrade <paketfil>"
 msgid "    -U <packagefile>      "
 msgstr "    -U <paketfil>         "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "uppgradera paket (samma flaggor som --install, samt)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -662,11 +663,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr "    --erase <paket>"
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "ta bort (avinstallera) paket"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -674,7 +675,7 @@ msgstr ""
 "ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
 "specificerar flera paket)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "kör inte paketspecifika skript"
 
@@ -686,52 +687,52 @@ msgstr "    -b<steg> <spec>       "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<steg> <tarboll>    "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "tillverka paket, där <steg> är något av:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "förbered (packa upp källkod samt applicera patchar)"
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrollera (gör några enkla kontroller på %files)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "kompilera (förbered och kompilera)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "installera (förbered, kompilera, installera)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr "binärpaketera (förbered, kompilera, installera, paketera)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "binär- och källpaketera (förbered, kompilera, installera, paketera)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "gå direkt till angivet steg (endast för c,i)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "ta bort tillverkningsträd efteråt"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr "ta bort källkod efteråt"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr "ta bort spec-fil efteråt"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr "tillverka en PGP/GPG-signatur"
 
@@ -739,7 +740,7 @@ msgstr "tillverka en PGP/GPG-signatur"
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <kat>   "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "använd <kat> som tillverkningsrot"
 
@@ -747,11 +748,11 @@ msgstr "använd <kat> som tillverkningsrot"
 msgid "      --target=<platform>+"
 msgstr "      --target=<plattfrm>+"
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "tillverka paketen för målen plattfrm1...plattfrmN."
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "utför inga steg"
 
@@ -767,7 +768,7 @@ msgstr "sätt tidskontrollen till <sek> sekunder (0 slår av)"
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <källpaket> "
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -779,7 +780,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <källpkt> "
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "som --rebuild, men tillverka inga paket"
 
@@ -787,7 +788,7 @@ msgstr "som --rebuild, men tillverka inga paket"
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pkt>+       "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "signera ett paket (släng nuvarande signatur)"
 
@@ -795,7 +796,7 @@ msgstr "signera ett paket (släng nuvarande signatur)"
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pkt>+      "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "lägg till signatur till ett paket"
 
@@ -807,19 +808,19 @@ msgstr "    --checksig <pkt>+"
 msgid "    -K <pkg>+             "
 msgstr "    -K <pkt>+             "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "verifiera paketsignatur"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "hoppa över eventuella PGP-signaturer"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr "hoppa över eventuella GPG-signaturer"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "hoppa över eventuella MD5-signaturer"
 
@@ -831,7 +832,7 @@ msgstr "förvissa dig om att en giltig databas existerar"
 msgid "rebuild database from existing database"
 msgstr "bygg om databasen från existerande databas"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -839,7 +840,7 @@ msgstr ""
 "sätt filrättigheterna till de i paketdatabasen med samma "
 "paketspecifikationsflaggor som -q"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -848,37 +849,37 @@ msgstr ""
 "paketspcifikationsflaggor som -q"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "enbart ett läge kan specifieras"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u och --uninstall undanbedes och fungerar inte längre.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Använd -e eller --erase istället.\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "omflyttningar måste börja med /"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "omflyttningar måste innehålla ett ="
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "omflyttningar måste ha ett / efter ="
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr "uteslutna sökvägar måste börja med /"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -886,108 +887,108 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Internt fel i argumenthantering (%d) :-(\n"
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "endast en typ av undersökning/verifiering kan utföras åt gången"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr "oväntade undersökningsflaggor"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr "oväntat undersökningsformat"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "oväntad undersökningskälla"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "enbart en av --prefix eller --relocate kan användas"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate och --excludepath kan endast användas när nya paket installeras"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast användas när nya paket installeras"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix måste börja med /"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart användas vid paketinstallation"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart användas vid paketinstallation"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan enbart användas vid paketinstallation"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart användas vid paketinstallation"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart användas vid paketinstallation"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart användas vid paketinstallation"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs läge kan specifieras"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart användas vid paketinstallation"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart användas vid paketinstallation"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart användas vid paketinstallation"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart användas när paket tas bort"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart användas vid paketinstallation"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kan enbart användas vid installation och avinstallation av paket"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1003,7 +1004,7 @@ msgstr ""
 "--notriggers kan enbart användas vid installation, avinstallation och "
 "verifiering"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1011,14 +1012,14 @@ msgstr ""
 "--nodeps kan enbart användas vid tillverkning, omtillverkning, "
 "omkompilering, installation, avinstallation, och verifiering"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test kan enbart användas vid installation, avinstallation och tillverkning"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1026,97 +1027,97 @@ msgstr ""
 "--root (-r) kan enbart användas vid installation, avinstallation, förfrågan, "
 "och databasombyggnad"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) måste börja med /"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage kan enbart användas vid paketuppgraderingar"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp kan enbart användas vid signaturkontroll"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg kan enbart användas vid signaturkontroll"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 kan enbart användas vid signaturkontroll och paketverifiering"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr "inga filer att signera\n"
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan inte komma åt filen %s\n"
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr "pgp hittades inte: "
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr "Ange lösenfras: "
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av lösenfrasen misslyckades\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Lösenfrasen är ok.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Felaktig %%_signature spec i makrofil.\n"
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign kan enbart användas vid pakettillverkning"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "oväntade argument till --querytags "
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "inga paket angivna för signaturkontroll"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "inga paket angivna för signering"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "inga paket angivna för avinstallation"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "inga paket angivna för installation"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "extra argument angivna för förfrågan om alla paket"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna för undersökning"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr "extra argument angivna för verifiering av alla paket"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna för verifiering"
 
@@ -1138,147 +1139,225 @@ msgstr "fel vid läsning av pakethuvud\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kan inte återöppna lasten: %s\n"
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<namn> <kropp>'"
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "skriv ut expansionen av makrot <namn> på standard ut"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "bygg om databasindex från existerande databashuvuden"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "inga paket\n"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr "hoppa över filer med inledande <sökväg>"
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "paket %s-%s-%s är redan installerat"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "        -p <paketfil>+ "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "utför inga steg"
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "kör inte utlösningsskript utlösta av detta paket"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "     --relocate <frånskv>=<tillskv>"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "   --upgrade <paketfil>   "
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+#, fuzzy
+msgid "Signature options:"
+msgstr "Signaturstorlek  : %d\n"
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Användning: %s {--help}\n"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <kat>]\n"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]\n"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr "       %s {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]\n"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr "       %s {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]\n"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [mål]\n"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [mål]\n"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile <fil>]\n"
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [--target=plattform1[,plattform2...]]"
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr "                        [--rmsource] [--rmspec] spec-fil"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] spec-fil\n"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--rebuild} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       %s {--recompile} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <fil>] paket1 paket2 ... paketN\n"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <fil>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
@@ -1286,268 +1365,227 @@ msgid ""
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr "  Alla arbetssätt stödjer följande argument:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<namn> <kropp>'"
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "   --eval '<namn>+'       "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "skriv ut expansionen av makrot <namn> på standard ut"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr "   --pipe <kommando>      "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Använd -e eller --erase istället.\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr "   --dbpath <kat>         "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr "   --root <kat>           "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   Installera, uppgradera och fråga (med -p) tillåter URL:er att användas"
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr "  istället för filnamn, liksom följande flaggor:"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr "     --ftpproxy <värd>    "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr "     --ftpport <port>     "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr "     --httpproxy <värd>   "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr "     --httpport <port>    "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr "  Flaggor för paketval:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr "fråga om/verifiera alla paket"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr "     -f <fil>+            "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr "fråga om/verifiera paket som äger <fil>"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr "     -p <paketfil>+       "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "fråga om/verifiera (oinstallerat) paket <paketfil>"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <pkt>  "
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr "fråga om/verifiera paket utlösta av <pkt>"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr "     --whatprovides <egenskap>"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr "fråga om/verifiera paket som tillhandahåller <egenskap>"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr "     --whatrequires <egenskap>"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr "fråga om/verifiera paket som behöver <egenskap>"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr "     --queryformat <ffmt> "
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr "    Flaggor för informationsval:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr "visa de egenskaper paketet tillhandahåller"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr "visa de egenskaper paketet behöver"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr "visa de olika [av]installationsskripten"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr "visa utlösningsskripten i paketet"
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "utför inga steg"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr "   --install <paketfil>   "
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr "   -i <paketfil>          "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr "     --excludepath <sökväg>"
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr "hoppa över filer med inledande <sökväg>"
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr "kör inte installationsskript"
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "kör inte utlösningsskript utlösta av detta paket"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr "     --prefix <katalog>   "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "     --relocate <frånskv>=<tillskv>"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr "   --upgrade <paketfil>   "
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr "   -U <paketfil>          "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr "   --erase <paket>  "
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr "   -b<steg> <spec>        "
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr "   -t<steg> <tar-arkiv>   "
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr "paket endast källrpm"
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr "     --buildroot <kat>    "
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr "     --target=<plattform>+"
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr "   --rebuild <källpaket>  "
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr "   --recompile <källpaket>"
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr "   --resign <pkt>+        "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr "   --addsign <pkt>+       "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr "   --checksig <pkt>+"
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr "   -K <pkt>+             "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr "initiera databasen (onödigt, ärvt format)"
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr "bygg om databasindex från existerande databashuvuden"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Använd -e eller --erase istället.\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath angivet för en operation som inte använder någon databas"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 "--notriggers kan enbart användas vid installation och avinstallation av paket"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna för omtillverkning"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "ingen spec-filer angivna för tillverkning"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för tillverkning"
 
@@ -2807,108 +2845,153 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr "buildroot redan specificerad"
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr "bygg till och med %%prep-steget från spec-fil"
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "förbered (packa upp källkod samt applicera patchar)"
+
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
+msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
-msgstr "bygg till och med %%build-steget från spec-fil"
+#: lib/poptBT.c:124
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <specfile>"
+msgstr "bygg till och med %%prep-steget från spec-fil"
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:127
+#, fuzzy
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr "bygg till och med %%install-steget från spec-fil"
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "verifiera %%files-sektionen i spec-fil"
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:133
+#, fuzzy
+msgid "build source and binary packages from <specfile>"
 msgstr "bygg käll- och binärpaket från spec-fil"
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:136
+#, fuzzy
+msgid "build binary package only from <specfile>"
 msgstr "bygg binärpaket från spec-fil"
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:139
+#, fuzzy
+msgid "build source package only from <specfile>"
 msgstr "bygg källpaket från spec-fil"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr "bygg till och med %%prep-steget från tar-arkiv"
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "förbered (packa upp källkod samt applicera patchar)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
-msgstr "bygg till och med %%build-steget från tar-arkiv"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
+msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+#, fuzzy
+msgid "build through %build (%prep, then compile) from <tarball>"
+msgstr "bygg till och med %%prep-steget från tar-arkiv"
+
+#: lib/poptBT.c:149
+#, fuzzy
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr "bygg till och med %%install-steget från tar-arkiv"
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
 msgstr "verifiera %%files-sektionen från tar-arkiv"
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:155
+#, fuzzy
+msgid "build source and binary packages from <tarball>"
 msgstr "bygg käll- och binärpaket från tar-arkiv"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
 msgstr "bygg binärpaket från tar-arkiv"
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+#, fuzzy
+msgid "build source package only from <tarball>"
 msgstr "bygg källpaket från tar-arkiv"
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+#, fuzzy
+msgid "build binary package from <source package>"
 msgstr "bygg binärpaket från källpaket"
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "inga paket\n"
+
+#: lib/poptBT.c:168
+#, fuzzy
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "bygg till och med %%install-steget från källpaket"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr "åsidosätt tillverkningsrot"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr "utför inga steg i tillverkningen"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:187
+#, fuzzy
+msgid "do not accept i18N msgstr's from specfile"
 msgstr "acceptera inte översatta \"msgstr\" från spec-filen"
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr "ta bort spec-fil efteråt"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr "åsidosätt målplattform"
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+#, fuzzy
+msgid "lookup i18N strings in specfile catalog"
 msgstr "slå upp översatta strängar i spec-fil katalog"
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+#, fuzzy
+msgid "query/verify package(s) owning file"
 msgstr "fråga om/verifiera paket som äger fil"
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+#, fuzzy
+msgid "query/verify package(s) in group"
 msgstr "fråga om/verifiera paket i grupp"
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+#, fuzzy
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "fråga om/verifiera en paketfil"
 
 #: lib/poptQV.c:76
@@ -2923,8 +3006,13 @@ msgstr "visa kända frågetaggar"
 msgid "query a spec file"
 msgstr "fråga om en spec-fil"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+#, fuzzy
+msgid "query the package(s) triggered by the package"
 msgstr "undersök paket utlösta av paketet"
 
 #: lib/poptQV.c:86
@@ -2936,42 +3024,44 @@ msgid "rpm verify mode (legacy)"
 msgstr "rpm verifieringsläge (ärvt)"
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
-msgstr "fråga om paket som behöver en egenskap"
+#, fuzzy
+msgid "query/verify the package(s) which require a dependency"
+msgstr "fråga om/verifiera paket som behöver <egenskap>"
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
-msgstr "fråga om paket som tillhandahåller en egenskap"
+#, fuzzy
+msgid "query/verify the package(s) which provide a dependency"
+msgstr "fråga om/verifiera paket som tillhandahåller <egenskap>"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr "lista alla konfigurationsfiler"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr "lista alla dokumentationsfiler"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr "visa filinformation"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr "lista filer i paketet"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr "använd följande frågeformat"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr "ersätt översatta sektioner till spec-fil"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr "visa tillstånd för de listade filerna"
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr "visa en utförlig fillistning"
 
@@ -3861,26 +3951,31 @@ msgstr "kör (eventuellt) postavinstallationsskript\n"
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "körning av skript från %s-%s-%s misslyckades, slutstatus %d"
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr "verifiera inte filerna i paketet"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "utför inga steg"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 "paket saknar både användarnamn och id-listor (detta borde aldrig inträffa)"
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 "paket saknar både gruppnamn och id-listor (detta borde aldrig inträffa)"
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "saknas     %s\n"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
@@ -4089,6 +4184,73 @@ msgstr "kunde inte öppna %s: %s\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile <fil>]\n"
+
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [--target=plattform1[,plattform2...]]"
+
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr "                        [--rmsource] [--rmspec] spec-fil"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] spec-fil\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--rebuild} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       %s {--recompile} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
+
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
+
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "   -b<steg> <spec>        "
+
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "   -t<steg> <tar-arkiv>   "
+
+#~ msgid "package src rpm only"
+#~ msgstr "paket endast källrpm"
+
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "     --buildroot <kat>    "
+
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "     --target=<plattform>+"
+
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "   --rebuild <källpaket>  "
+
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "   --recompile <källpaket>"
+
+#~ msgid "build through %%build stage from spec file"
+#~ msgstr "bygg till och med %%build-steget från spec-fil"
+
+#~ msgid "build through %%build stage from tar ball"
+#~ msgstr "bygg till och med %%build-steget från tar-arkiv"
+
+#~ msgid "query the packages which require a capability"
+#~ msgstr "fråga om paket som behöver en egenskap"
+
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "fråga om paket som tillhandahåller en egenskap"
+
 #~ msgid "exec failed!\n"
 #~ msgstr "exec misslyckades!\n"
 
diff --git a/po/tr.po b/po/tr.po
index 2afd637ca..bbfb4d36c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,49 +30,49 @@ msgid "Unable to open spec file %s: %s\n"
 msgstr "%s okuma eriþimi için açýlamadý:%s."
 
 # , c-format
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "%s 'ye eriþimde hata oluþtu\n"
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "%s okunamadý: %s"
 
-#: build.c:177
+#: build.c:175
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "%s okunamadý: %s"
 
-#: build.c:216
+#: build.c:214
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "%s açýlamadý: %s"
 
-#: build.c:221
+#: build.c:219
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s bir RPM paketi deðil (gibi)\n"
 
-#: build.c:229
+#: build.c:227
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s bir RPM paketi deðil (gibi)\n"
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "%s paketi bulunamadý\n"
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
@@ -90,17 +90,17 @@ msgstr ""
 # May 5, 1998 
 #
 # , c-format
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Sürüm %s\n"
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 #, fuzzy
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 #, fuzzy
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr "Bu ðrogram GNU GPL uyarýnca serbestçe daðýtýlabilir."
@@ -124,12 +124,12 @@ msgid ""
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <dizin>]"
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
@@ -139,35 +139,35 @@ msgid ""
 msgstr ""
 "                        [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <dizin>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate eskidizin=yenidizin]"
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
@@ -178,7 +178,7 @@ msgid ""
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <dizin>] [--noscripts]"
 
@@ -188,7 +188,7 @@ msgid ""
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <dosya>]"
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -200,22 +200,22 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate eskidizin=yenidizin]"
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
@@ -229,23 +229,23 @@ msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <dizin>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [targets]"
@@ -255,14 +255,14 @@ msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <dizin>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
@@ -284,11 +284,11 @@ msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <dizin>] [--nodeps] [--allmatches]"
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] paket1 ... paketN"
@@ -307,7 +307,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paketN"
 
@@ -319,16 +319,16 @@ msgstr "       rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 #, fuzzy
 msgid "Usage:"
 msgstr "Kullaným:"
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr "Bu bilgiyi verir"
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr "Kullanýlan RPM sürümünü verir"
 
@@ -341,7 +341,7 @@ msgstr "   tüm kipler aþaðýdaki argümanlarý kabul ederler:"
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -360,7 +360,7 @@ msgstr "Kullanýlan RPM sürümünü verir"
 msgid "    --pipe <cmd>          "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr "standart çýktýyý <KOMUT>'a gönderir"
 
@@ -373,15 +373,15 @@ msgstr "    -b<adým> <spec>      "
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "/etc/rpmrc ve $HOME/.rpmrc yerine <dosya> kullanýn"
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr "daha çok açýklama verir"
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr "çok fazla açýklama verir (hata ayýklama için)"
 
@@ -400,7 +400,7 @@ msgstr "   yerine FTP adreslerini aþaðýdaki seçeneklerle kabul eder:\n"
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
 
@@ -408,7 +408,7 @@ msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
 
@@ -417,7 +417,7 @@ msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
 msgid "      --httpproxy <host>  "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
@@ -427,12 +427,12 @@ msgstr "Makina ismi veya FTP-Proxy'nin IP numarasý"
 msgid "      --httpport <port>   "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "FTP sunucusunun (ya da Proxy'nin) port numarasý"
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr "Sorgulama kipi"
 
@@ -441,7 +441,7 @@ msgstr "Sorgulama kipi"
 msgid "      --dbpath <dir>      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr "Veritabaný dizini olarak <dizin> kullanýlýr"
 
@@ -449,7 +449,7 @@ msgstr "Veritabaný dizini olarak <dizin> kullanýlýr"
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "'header format' olarak s kullanýlýr (-i'yi gerektirir)"
@@ -458,7 +458,7 @@ msgstr "'header format' olarak s kullanýlýr (-i'yi gerektirir)"
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr "kök (baþlangýç) dizini olarak <dizin> kullanýlýr"
 
@@ -520,32 +520,32 @@ msgstr "<i> yeteneðine ihtiyaç duyan paketleri sorgulama"
 msgid "      Information selection options:"
 msgstr "      Bilgilendirme seçenekleri:"
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr "Paket bilgisini gösterme"
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr "Paketin 'Change Log' (deðiþiklik) bilgisini gösterme"
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr "Paketin içerdiði dosyalarý gösterme"
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr "dosyalarýn durumunu gösterir (-l gerektirir)"
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr "sadece belge dosyalarýný gösterir (-l gerektirir)"
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 "sadece yapýlandýrma (configuration) dosyalarýný gösterir (impliziert -l)"
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -569,25 +569,26 @@ msgstr "paketin çeþitli yükleme, silme betiklerini (scripts) gösterir"
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "paketi -q ile belirtilen paket parametrelerini kullanarak doðrula"
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr "paket baðýmlýlýklarýný doðrulamaz"
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr "dosyalarýn 'md5-checksum' larýný doðrulamaz"
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr "dosya özelliklerini doðrulamaz"
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr "sorgulama sýrasýnda kullanýlabilecek 'Tag'leri sýralar"
 
@@ -601,7 +602,7 @@ msgstr "paket yüklemek"
 msgid "    -i <packagefile>      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr "paket yüklemek"
 
@@ -619,11 +620,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "%s pakedi yüklenmemiþ\n"
@@ -632,48 +633,48 @@ msgstr "%s pakedi yüklenmemiþ\n"
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "paketin yerini (eðer deðitirilebiliyorsa) <dizin>'e deðiþtirir"
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr "yazýlýmýn belgelerini yüklemez"
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs --replacefiles'ýn kýsaltmasý"
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr "yükleme sýrasýnda bir gösterge çýkarýr (-v seçeneði ile iyi)"
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "tüm dosyalarý, hatta normal olarak atlanabilecek yapýlandýrmalarý bile,yükler"
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr "paket mimarisini doðrulamaz"
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr "paketin ait olduðu iþletim sistemini doðrulamaz"
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr "paket ile gelen belgeleri de yükler"
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr "veri tabanýný günceller, ama dosya sistemini deðiþtirmez"
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "paket yükleme sýrasýný baðýmlýlýklara göre düzenleme"
 
@@ -681,23 +682,23 @@ msgstr "paket yükleme sýrasýný baðýmlýlýklara göre düzenleme"
 msgid "don't execute any installation scripts"
 msgstr "yükleme betiklerini (scripts) çalýþtýrmaz."
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr "yükleme sýrasýnda geliþme yüzde olarak gösterilir"
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr "paket mevcut dosyalarý silse bile paketi yükler"
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr "paket mevcutsa yeniden yükler"
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr "yükleme yapmaz, sadece çalýþýp çalýþmayacaðýný belirtir"
 
@@ -710,11 +711,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr "Paketi günceller (seçenekler --install ile ayný, ek olarak)"
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -725,11 +726,11 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr "paketi siler (uninstall)"
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -737,7 +738,7 @@ msgstr ""
 "<paket> ile eþlenen tüm paketleri siler (birden fazla paket eþlenirse bir "
 "hata mesajý çýkmasý gerekir)"
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr "pakete ait hiçbir betik (Script) çalýþtýrýlmaz"
 
@@ -750,58 +751,58 @@ msgstr "    -b<adým> <spec>      "
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr "paket yaratýr, <adým> aþaðýdaki harflerden biridir:"
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr "hazýrlama (kaynaklar açýlýr ve yamalar uygulanýr)"
 
 # , c-format
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrol ( %files üstünkörü bir kontrol edilir)"
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr "derleme (hazýrlama ve derleme)"
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr "yükleme (hazýrlama, derleme, yükleme)"
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 "çalýþtýrýlabilir paket yaratma (hazýrlama, derleme, yükleme, paketleme)"
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "çalýþtýrýlabilir ve Kaynak paket yaratmak (hazýrlama, derleme, yükleme "
 "vepaketleme)"
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "doðrudan belirtilen adýma atlar (sadece c ve i için)"
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr "iþlem sonunda paket yaratma yapýsýný siler"
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 #, fuzzy
 msgid "remove sources when done"
 msgstr "iþlem sonunda kaynaklarý ve spec dosyasýný siler"
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "iþlem sonunda kaynaklarý ve spec dosyasýný siler"
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP-imzasý yaratýr"
@@ -811,7 +812,7 @@ msgstr "PGP-imzasý yaratýr"
 msgid "      --buildroot <dir>   "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr "paket yaratýlýrken <dizin> baþlangýç dizini olarak kullanýlýr"
 
@@ -819,11 +820,11 @@ msgstr "paket yaratýlýrken <dizin> baþlangýç dizini olarak kullanýlýr"
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr "adýmlarýn hiçbirini çalýþtýrmaz"
 
@@ -841,7 +842,7 @@ msgstr "zaman kontrolünü S saniyeye ayarlar (0 ile tümüyle kaldýrýr)"
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -853,7 +854,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr "--rebuild gibi, ama paket yaratmaz"
 
@@ -862,7 +863,7 @@ msgstr "--rebuild gibi, ama paket yaratmaz"
 msgid "    --resign <pkg>+       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 
@@ -871,7 +872,7 @@ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr "pakete bir imza ekler"
 
@@ -885,20 +886,20 @@ msgstr "    -b<adým> <spec>      "
 msgid "    -K <pkg>+             "
 msgstr "    -b<adým> <spec>      "
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr "paket imzasýný doðrular"
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr "tüm PGP imzalarýný atlar"
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "tüm PGP imzalarýný atlar"
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr "tüm MD5 imzalarýný atlar"
 
@@ -910,7 +911,7 @@ msgstr "geçerli bir veri tabaný olmasýný saðlar"
 msgid "rebuild database from existing database"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -918,7 +919,7 @@ msgstr ""
 "dosya eriþim haklarýný veri tabanýnda yer alanlarla -q ile belirtilen paket "
 "parametrelerini kullanarak güncelle"
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -927,38 +928,38 @@ msgstr ""
 "belirtilen paket parametrelerini kullanarak güncelle"
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip (major mode) belirtilebilir"
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ve --uninstall komutlarý eskidirler ve çalýþmamaktadýrlar.\n"
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr "Yerine  -e veya --erase komutunu kullanýn\n"
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr "relocate iþlemi / ile baþlamalý"
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr "relocate satýrýnda = bulunmalý"
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr "relocate için = den sonra bir / gerekir"
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "relocate iþlemi / ile baþlamalý"
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -966,111 +967,111 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama veya doðrulama yapýlabilir"
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama kaynaðý girildi"
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 #, fuzzy
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama kaynaðý girildi"
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kaynaðý girildi"
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "sadece yükleme ve güncelleme zorlanabilir (force edilebilir)"
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr "dosyalar sadece paket yüklemesi sýrasýnda relocate edilebilir"
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir"
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate sadece yeni paketler yüklenirken kullanýlýr"
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix komutunun argümanlarý '/' ile baþlamalý"
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "--excludedocs ve --includedocs bir arada kullanýlamaz (bi daha olmasýn)"
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket silinmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket yüklenmesi sýrasýnda kullanýlabilir"
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1084,7 +1085,7 @@ msgid ""
 msgstr ""
 "--nodeps sadece paket yüklemelerinde, silme ve doðrulamalarda kullanýlýr"
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1092,13 +1093,13 @@ msgid ""
 msgstr ""
 "--nodeps sadece paket yüklemelerinde, silme ve doðrulamalarda kullanýlýr"
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test sadece paket yüklemelerinde, silme ve derlemelerinde kullanýlýr"
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1106,103 +1107,103 @@ msgstr ""
 "--root (-r) sadece yükleme, silme, sorgulama ve veritabaný güncellemelerinde "
 "kullanýlýr"
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) komutun argümanlarý '/' ile baþlamalý"
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage sadece güncelleme sýrasýnda kullanýlabilir"
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp sadece Ýmza kontrolü sýrasýnda kullanýlabilir"
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nopgp sadece imza kontrolü veya paket doðrulamasý sýrasýnda kullanýlýr"
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Dosya sunucuda bulunamadý"
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr "Parola kontrolü baþarýsýzlýkla sonuçlandý\n"
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr "Parola doðru.\n"
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr "--sign sadece paket olusturulurken kullanýlabilir"
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Eriþilemedi\n"
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags için beklenmeyen argümanlar"
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr "imzasý kontrol edilecek paketler belirtilmedi"
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr "imzalanacak paketler belirtilmedi"
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr "sistemden silinecek paketler belirtilmedi"
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr "yüklenecek paketler belirtilmedi"
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "tüm paketlerin sorgulanmasý için fazladan argümanlar belirtildi"
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr "doðrulama için hiç argüman belirtilmedi"
 
@@ -1225,469 +1226,494 @@ msgstr "%s paketi bulunamadý\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "%s dosyasý açýlamýyor: "
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:159
 #, fuzzy
-msgid "print macro expansion to stdout"
+msgid "print macro expansion of <expr>+"
 msgstr "Kullanýlan RPM sürümünü verir"
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+#, fuzzy
+msgid "rebuild database inverted lists from installed package headers"
+msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+#, fuzzy
+msgid "<package>"
+msgstr "Tüm paketleri sorgulama"
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+#, fuzzy
+msgid "upgrade package if already installed"
+msgstr "%s pakedi yüklenmemiþ\n"
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+#, fuzzy
+msgid "<packagefile>+"
+msgstr "    -b<adým> <spec>      "
+
+#: rpmqv.c:297 rpmqv.c:606
+#, fuzzy
+msgid "do not execute scripts (if any)"
+msgstr "adýmlarýn hiçbirini çalýþtýrmaz"
+
+#: rpmqv.c:300 rpmqv.c:654
+#, fuzzy
+msgid "don't execute any scriptlets triggered by this package"
+msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
+
+#: rpmqv.c:313
+#, fuzzy
+msgid "<oldpath>=<newpath>"
+msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
+
+#: rpmqv.c:324
+#, fuzzy
+msgid "upgrade package"
+msgstr "paket yüklemek"
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Kullaným: rpm {--help}"
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <dizin>]"
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, fuzzy, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 #, fuzzy
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 #, fuzzy
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <dosya>]"
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, fuzzy, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 #, fuzzy
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 "                        [--scripts] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, fuzzy, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [target]"
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [target]"
 
-#: rpmqv.c:348
-#, fuzzy, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-"       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<dosya>]"
-
-#: rpmqv.c:350
-#, fuzzy
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr "                        [targets]"
-
-#: rpmqv.c:351
-#, fuzzy
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-"                        [--buildarch <mimari>] [--rmsource] specdosyasý"
-
-#: rpmqv.c:352
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       rpm {--rmsource} [--rcfile <dosya>] [-v] specdosyasý"
-
-#: rpmqv.c:353
-#, fuzzy, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--rebuild} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
-
-#: rpmqv.c:354
-#, fuzzy, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-"       rpm {--recompile} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
-
-#: rpmqv.c:355
-#, fuzzy, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, fuzzy, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, fuzzy, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, fuzzy, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   tüm kipler aþaðýdaki argümanlarý kabul ederler:"
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 #, fuzzy
 msgid "   --eval '<expr>+'       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 #, fuzzy
 msgid "print the expansion of macro <expr> to stdout"
 msgstr "Kullanýlan RPM sürümünü verir"
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 #, fuzzy
 msgid "   --macros <file:...>    "
 msgstr "Yerine  -e veya --erase komutunu kullanýn\n"
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   yükleme, güncelleme ve sorgulama (-p ile) iþlemlerimde dosya isimleri "
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   yerine FTP adreslerini aþaðýdaki seçeneklerle kabul eder:\n"
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Paket seçim seçenekleri:"
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Tüm paketleri sorgulama"
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "(henüz yüklenmemiþ) <paket dosyasý> paketi sorgulama"
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --requires"
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "<i> yeteneði olan paketleri sorgulama"
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --requires"
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "<i> yeteneðine ihtiyaç duyan paketleri sorgulama"
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Bilgilendirme seçenekleri:"
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "paketin saðladýðý yetenekleri sýralar"
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "paketin saðladýðý yetenekleri sýralar"
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "paketin çeþitli yükleme, silme betiklerini (scripts) gösterir"
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-#, fuzzy
-msgid "do not execute verify script (if any)"
-msgstr "adýmlarýn hiçbirini çalýþtýrmaz"
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "paket yüklemek"
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "yükleme betiklerini (scripts) çalýþtýrmaz."
 
-#: rpmqv.c:543
-#, fuzzy
-msgid "don't execute any scriptlets triggered by this package"
-msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "dosyalarý <eskidizin> den <yenidizin> e relocate et"
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "paket yüklemek"
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "paket yüklemek"
 
-#: rpmqv.c:582
-#, fuzzy
-msgid "   -b<stage> <spec>       "
-msgstr "    -b<adým> <spec>      "
-
-#: rpmqv.c:583
-#, fuzzy
-msgid "   -t<stage> <tarball>    "
-msgstr "    -b<adým> <spec>      "
-
-#: rpmqv.c:598
-#, fuzzy
-msgid "package src rpm only"
-msgstr "pakedin adý yok :-)"
-
-#: rpmqv.c:609
-#, fuzzy
-msgid "     --buildroot <dir>    "
-msgstr "    -b<adým> <spec>      "
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "     --target=<platform>+ "
-msgstr "    -b<adým> <spec>      "
-
-#: rpmqv.c:616
-#, fuzzy
-msgid "   --rebuild <src_pkg>    "
-msgstr "    -b<adým> <spec>      "
-
-#: rpmqv.c:618
-#, fuzzy
-msgid "   --recompile <src_pkg>  "
-msgstr "    -b<adým> <spec>      "
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<adým> <spec>      "
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr "Yerine  -e veya --erase komutunu kullanýn\n"
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath veritabaný kullanýlmayan bir iþlemde belirtildi"
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb sadece paket yükleme ve silmelerinde kullanýlýr"
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr "yeniden oluþturmak için paket dosyalarý belirtilmedi"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr "oluþturma için gerekli spec dosyasý belirtilmedi"
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr "oluþturma için gereken tar dosyalarý belirttilmedi"
 
@@ -2961,123 +2987,152 @@ msgid ""
 msgstr ""
 "RPM'in bu sürümünde sadece major numarasý <= 3 olan paketler destekleniyor"
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
-msgstr ""
+#: lib/poptBT.c:121
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
+msgstr "hazýrlama (kaynaklar açýlýr ve yamalar uygulanýr)"
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
+#: lib/poptBT.c:127
 #, fuzzy
-msgid "verify %%files section from spec file"
+msgid "build through %install (%prep, %build, then install) from <specfile>"
+msgstr "paket yüklemek"
+
+#: lib/poptBT.c:130
+#, fuzzy, c-format
+msgid "verify %files section from <specfile>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: lib/poptBT.c:118
+#: lib/poptBT.c:133
 #, fuzzy
-msgid "build source and binary package from spec file"
+msgid "build source and binary packages from <specfile>"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/poptBT.c:120
+#: lib/poptBT.c:136
 #, fuzzy
-msgid "build binary package from spec file"
+msgid "build binary package only from <specfile>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: lib/poptBT.c:122
+#: lib/poptBT.c:139
 #, fuzzy
-msgid "build source package from spec file"
+msgid "build source package only from <specfile>"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
-msgstr ""
+#: lib/poptBT.c:143
+#, fuzzy, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
+msgstr "hazýrlama (kaynaklar açýlýr ve yamalar uygulanýr)"
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
+#: lib/poptBT.c:152
+#, fuzzy, c-format
+msgid "verify %files section from <tarball>"
+msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
+
+#: lib/poptBT.c:155
 #, fuzzy
-msgid "build source and binary package from tar ball"
+msgid "build source and binary packages from <tarball>"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
-msgstr ""
+#: lib/poptBT.c:158
+#, fuzzy
+msgid "build binary package only from <tarball>"
+msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/poptBT.c:137
+#: lib/poptBT.c:161
 #, fuzzy
-msgid "build source package from tar ball"
+msgid "build source package only from <tarball>"
 msgstr "paketleri <os> iþletim sistemi için oluþturur"
 
-#: lib/poptBT.c:140
+#: lib/poptBT.c:165
 #, fuzzy
-msgid "build binary package from source package"
+msgid "build binary package from <source package>"
 msgstr ""
 "çalýþtýrýlabilir paket yaratma (hazýrlama, derleme, yükleme, paketleme)"
 
-#: lib/poptBT.c:142
+#: lib/poptBT.c:166 lib/poptBT.c:169
+#, fuzzy
+msgid "<source package>"
+msgstr "Tüm paketleri sorgulama"
+
+#: lib/poptBT.c:168
 #, fuzzy
-msgid "build through %%install stage from source package"
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
 msgstr "paket yüklemek"
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:172
 #, fuzzy
 msgid "override build root"
 msgstr "paket yaratýlýrken <dizin> baþlangýç dizini olarak kullanýlýr"
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "adýmlarýn hiçbirini çalýþtýrmaz"
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "iþlem sonunda kaynaklarý ve spec dosyasýný siler"
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
 #, fuzzy
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
 #: lib/poptQV.c:72
 #, fuzzy
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr "pakedin adý yok :-)"
 
 #: lib/poptQV.c:74
 #, fuzzy
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr "Tüm paketleri sorgulama"
 
 #: lib/poptQV.c:76
@@ -3094,9 +3149,13 @@ msgstr ""
 msgid "query a spec file"
 msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n"
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
 #, fuzzy
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
 #: lib/poptQV.c:86
@@ -3111,50 +3170,50 @@ msgstr "Sorgulama kipi"
 
 #: lib/poptQV.c:90
 #, fuzzy
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr "<i> yeteneðine ihtiyaç duyan paketleri sorgulama"
 
 #: lib/poptQV.c:92
 #, fuzzy
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr "<i> yeteneði olan paketleri sorgulama"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all configuration files"
 msgstr ""
 "sadece yapýlandýrma (configuration) dosyalarýný gösterir (impliziert -l)"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "list all documentation files"
 msgstr "paket ile gelen belgeleri de yükler"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "dump basic file information"
 msgstr "Paket bilgisini gösterme"
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 #, fuzzy
 msgid "list files in package"
 msgstr "paket yüklemek"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "use the following query format"
 msgstr "beklenmeyen sorgulama kaynaðý girildi"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "<dosya> isimli dosyayý içeren paketi sorgulamak"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "Paketin içerdiði dosyalarý gösterme"
@@ -4033,25 +4092,30 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr "betik (script) çalýþtýrýlamadý "
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "paket yüklemek"
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+#, fuzzy
+msgid "do not execute %verifyscript (if any)"
+msgstr "adýmlarýn hiçbirini çalýþtýrmaz"
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "% den sonra eksik {"
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s 'nin baðýmlýlýk sorunlarý: "
@@ -4271,6 +4335,81 @@ msgid "failed to create %s: %s\n"
 msgstr "%s yaratýlamýyor\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
+#~ "<file:...>]\n"
+#~ msgstr ""
+#~ "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
+#~ "<dosya>]"
+
+#, fuzzy
+#~ msgid "                        [--target=platform1[,platform2...]]"
+#~ msgstr "                        [targets]"
+
+#, fuzzy
+#~ msgid "                        [--rmsource] [--rmspec] specfile"
+#~ msgstr ""
+#~ "                        [--buildarch <mimari>] [--rmsource] specdosyasý"
+
+#, fuzzy
+#~ msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#~ msgstr "       rpm {--rmsource} [--rcfile <dosya>] [-v] specdosyasý"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--rebuild} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
+
+#, fuzzy
+#~ msgid ""
+#~ "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
+#~ "sourceN.rpm\n"
+#~ msgstr ""
+#~ "       rpm {--recompile} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
+
+#, fuzzy
+#~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
+#~ msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
+
+#, fuzzy
+#~ msgid "   -b<stage> <spec>       "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
+#~ msgid "   -t<stage> <tarball>    "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
+#~ msgid "package src rpm only"
+#~ msgstr "pakedin adý yok :-)"
+
+#, fuzzy
+#~ msgid "     --buildroot <dir>    "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
+#~ msgid "     --target=<platform>+ "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
+#~ msgid "   --rebuild <src_pkg>    "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
+#~ msgid "   --recompile <src_pkg>  "
+#~ msgstr "    -b<adým> <spec>      "
+
+#, fuzzy
+#~ msgid "query the packages which require a capability"
+#~ msgstr "<i> yeteneðine ihtiyaç duyan paketleri sorgulama"
+
+#, fuzzy
+#~ msgid "query the packages which provide a capability"
+#~ msgstr "<i> yeteneði olan paketleri sorgulama"
+
+#, fuzzy
 #~ msgid "exec failed!\n"
 #~ msgstr "%s: Eriþilemedi\n"
 
diff --git a/po/uk.po b/po/uk.po
index a7349a907..48735c064 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index a7349a907..48735c064 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index a7349a907..48735c064 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index a7349a907..48735c064 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2000-12-30 13:33-0500\n"
+"POT-Creation-Date: 2001-01-01 18:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,63 +28,63 @@ msgstr ""
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:131 build.c:143
+#: build.c:129 build.c:141
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:150
+#: build.c:148
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:177
+#: build.c:175
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:214
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:221
+#: build.c:219
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:229
+#: build.c:227
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:289
+#: build.c:285
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:304
+#: build.c:300
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:269
+#: rpm.c:185 rpmqv.c:391
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:280
+#: rpm.c:196 rpmqv.c:402
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:284
+#: rpm.c:200 rpmqv.c:406
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:285
+#: rpm.c:201 rpmqv.c:407
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,11 +105,11 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:306
+#: rpm.c:213 rpmqv.c:428
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:307
+#: rpm.c:214 rpmqv.c:429
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
@@ -118,30 +118,30 @@ msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:309
+#: rpm.c:216 rpmqv.c:431
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
+#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:312
+#: rpm.c:219 rpmqv.c:434
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:313
+#: rpm.c:220 rpmqv.c:435
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:314
+#: rpm.c:221 rpmqv.c:436
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,7 +150,7 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:316
+#: rpm.c:223 rpmqv.c:438
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:318
+#: rpm.c:225 rpmqv.c:440
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:321
+#: rpm.c:228 rpmqv.c:443
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:322
+#: rpm.c:229 rpmqv.c:444
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:323
+#: rpm.c:230 rpmqv.c:445
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:324
+#: rpm.c:231 rpmqv.c:446
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -193,19 +193,19 @@ msgstr ""
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:333
+#: rpm.c:234 rpmqv.c:455
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:334
+#: rpm.c:235 rpmqv.c:456
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:337
+#: rpm.c:238 rpmqv.c:459
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:338
+#: rpm.c:239 rpmqv.c:460
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:340
+#: rpm.c:241 rpmqv.c:462
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:341
+#: rpm.c:242 rpmqv.c:463
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:326
+#: rpm.c:247 rpmqv.c:448
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:327
+#: rpm.c:248 rpmqv.c:449
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:362
+#: rpm.c:252 rpmqv.c:473
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:398
+#: rpm.c:288 rpmqv.c:509
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:400
+#: rpm.c:290 rpmqv.c:511
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:402
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:411
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -319,15 +319,15 @@ msgstr ""
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:415
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:423
+#: rpm.c:307 rpmqv.c:534
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:425
+#: rpm.c:309 rpmqv.c:536
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:432
+#: rpm.c:315 rpmqv.c:543
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:434
+#: rpm.c:317 rpmqv.c:545
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:436
+#: rpm.c:319 rpmqv.c:547
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:438
+#: rpm.c:321 rpmqv.c:549
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:458
+#: rpm.c:325 rpmqv.c:569
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:460
+#: rpm.c:329 rpmqv.c:571
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:464
+#: rpm.c:347 rpmqv.c:575
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:466
+#: rpm.c:349 rpmqv.c:577
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:468
+#: rpm.c:351 rpmqv.c:579
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:470
+#: rpm.c:353 rpmqv.c:581
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:472
+#: rpm.c:355 rpmqv.c:583
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:474
+#: rpm.c:357 rpmqv.c:585
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:476
+#: rpm.c:359 rpmqv.c:587
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,25 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:487
+#: rpm.c:371 rpmqv.c:598
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
+#: lib/poptBT.c:182 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
+#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:379 rpmqv.c:493
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:491
+#: rpm.c:381 rpmqv.c:602
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:498
+#: rpm.c:383 rpmqv.c:609
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -527,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:512
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
 msgid "install package"
 msgstr ""
 
@@ -543,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:549
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:517
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -555,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:547
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:519
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:523
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:525
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:514
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:527
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:529
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:531
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:533
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -603,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:577
+#: rpm.c:425 rpm.c:460 rpmqv.c:688
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:545
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:551
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:553
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:555
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -631,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:559
+#: rpm.c:440 rpmqv.c:670
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:561
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -645,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:565
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:567
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:575
+#: rpm.c:458 rpmqv.c:686
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -667,52 +668,52 @@ msgstr ""
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:466 rpmqv.c:584
+#: rpm.c:466
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:468 rpmqv.c:586
+#: rpm.c:468
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:470 rpmqv.c:588
+#: rpm.c:470
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:472 rpmqv.c:590
+#: rpm.c:472
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:474 rpmqv.c:592
+#: rpm.c:474
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:476 rpmqv.c:594
+#: rpm.c:476
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:478 rpmqv.c:596
+#: rpm.c:478
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
+#: lib/poptBT.c:193 rpm.c:480
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
+#: lib/poptBT.c:174 rpm.c:482
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
+#: lib/poptBT.c:189 rpm.c:484
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:486 rpmqv.c:606
+#: rpm.c:486
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:488 rpmqv.c:608
+#: lib/poptBT.c:195 rpm.c:488 rpmqv.c:224
 msgid "generate PGP/GPG signature"
 msgstr ""
 
@@ -720,7 +721,7 @@ msgstr ""
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:490 rpmqv.c:610
+#: rpm.c:490
 msgid "use <dir> as the build root"
 msgstr ""
 
@@ -728,11 +729,11 @@ msgstr ""
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:492 rpmqv.c:612
+#: rpm.c:492
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:494 rpmqv.c:614
+#: rpm.c:494
 msgid "do not execute any stages"
 msgstr ""
 
@@ -748,7 +749,7 @@ msgstr ""
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:499 rpmqv.c:617
+#: rpm.c:499
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -758,7 +759,7 @@ msgstr ""
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:501 rpmqv.c:619
+#: rpm.c:501
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
@@ -766,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:625
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -774,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:627
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
 msgid "add a signature to a package"
 msgstr ""
 
@@ -786,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:631
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:633
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:635
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:637
+#: rpm.c:516 rpmqv.c:706
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -810,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:500
+#: rpm.c:530 rpmqv.c:611
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:503
+#: rpm.c:533 rpmqv.c:614
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
-#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
-#: rpmqv.c:978
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
+#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
+#: rpmqv.c:1047
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:827
+#: rpm.c:679 rpmqv.c:896
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:829
+#: rpm.c:681 rpmqv.c:898
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:872
+#: rpm.c:764 rpmqv.c:941
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:874
+#: rpm.c:766 rpmqv.c:943
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:877
+#: rpm.c:769 rpmqv.c:946
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:861
+#: rpm.c:778 rpmqv.c:930
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:931
+#: rpm.c:787 rpmqv.c:1000
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -861,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:937
+#: rpm.c:793 rpmqv.c:1006
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:993
+#: rpm.c:828 rpmqv.c:1062
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:997
+#: rpm.c:833 rpmqv.c:1066
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1000
+#: rpm.c:836 rpmqv.c:1069
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1003
+#: rpm.c:839 rpmqv.c:1072
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1023
+#: rpm.c:842 rpmqv.c:1082
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1028
+#: rpm.c:845 rpmqv.c:1087
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1031
+#: rpm.c:848 rpmqv.c:1090
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1034
+#: rpm.c:851 rpmqv.c:1093
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1037
+#: rpm.c:854 rpmqv.c:1096
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1040
+#: rpm.c:857 rpmqv.c:1099
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1043
+#: rpm.c:860 rpmqv.c:1102
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1047
+#: rpm.c:864 rpmqv.c:1106
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1051
+#: rpm.c:868 rpmqv.c:1110
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1055
+#: rpm.c:872 rpmqv.c:1114
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1059
+#: rpm.c:876 rpmqv.c:1118
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1063
+#: rpm.c:880 rpmqv.c:1122
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1067
+#: rpm.c:884 rpmqv.c:1126
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1071
+#: rpm.c:888 rpmqv.c:1130
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1075
+#: rpm.c:892 rpmqv.c:1134
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1079
+#: rpm.c:896 rpmqv.c:1138
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1083
+#: rpm.c:900 rpmqv.c:1142
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1087
+#: rpm.c:904 rpmqv.c:1146
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1091
+#: rpm.c:908 rpmqv.c:1150
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1098
+#: rpm.c:913 rpmqv.c:1157
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -971,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1110
+#: rpm.c:921 rpmqv.c:1167
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1115
+#: rpm.c:926 rpmqv.c:1172
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1120
+#: rpm.c:930 rpmqv.c:1177
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1132
+#: rpm.c:942 rpmqv.c:1189
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1139
+#: rpm.c:948 rpmqv.c:1196
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1144
+#: rpm.c:951 rpmqv.c:1201
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1147
+#: rpm.c:954 rpmqv.c:1204
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1152
+#: rpm.c:957 rpmqv.c:1209
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1165
+#: rpm.c:968 rpmqv.c:1225
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1170
+#: rpm.c:973 rpmqv.c:1230
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1186
+#: rpm.c:988 rpmqv.c:1246
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1190
+#: rpm.c:992 rpmqv.c:1250
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1192
+#: rpm.c:994 rpmqv.c:1252
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1195
+#: rpm.c:997 rpmqv.c:1255
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1200
+#: rpm.c:1002 rpmqv.c:1260
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1206
+#: rpm.c:1008 rpmqv.c:1266
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1222
+#: rpm.c:1023 rpmqv.c:1282
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1491
+#: rpm.c:1042 rpmqv.c:1552
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1513
+#: rpm.c:1053 rpmqv.c:1574
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1524
+#: rpm.c:1064 rpmqv.c:1585
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1363
+#: rpm.c:1080 rpmqv.c:1422
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1414
+#: rpm.c:1131 rpmqv.c:1473
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1454
+#: rpm.c:1154 rpmqv.c:1513
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1459
+#: rpm.c:1159 rpmqv.c:1518
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1479
+#: rpm.c:1176 rpmqv.c:1540
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1483
+#: rpm.c:1180 rpmqv.c:1544
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1101,397 +1102,430 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
+#: rpmqv.c:152
+msgid "provide less detailed output"
+msgstr ""
+
 #: rpmqv.c:154
+msgid "provide more detailed output"
+msgstr ""
+
+#: rpmqv.c:157
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:156
-msgid "print macro expansion to stdout"
+#: rpmqv.c:159
+msgid "print macro expansion of <expr>+"
 msgstr ""
 
-#: rpmqv.c:156
+#: rpmqv.c:160
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:181
+#: rpmqv.c:163
+msgid "<cmd>"
+msgstr ""
+
+#: rpmqv.c:166 rpmqv.c:310
+msgid "<dir>"
+msgstr ""
+
+#: rpmqv.c:168
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:169 rpmqv.c:173 rpmqv.c:177
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:296
+#: rpmqv.c:172 rpmqv.c:176
+msgid "read <file:...> instead of default rpmrc file(s)"
+msgstr ""
+
+#: rpmqv.c:185
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: rpmqv.c:188
+msgid "debug protocol data stream"
+msgstr ""
+
+#: rpmqv.c:190
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: rpmqv.c:192
+msgid "debug URL cache handling"
+msgstr ""
+
+#: rpmqv.c:200
+msgid "initialize database"
+msgstr ""
+
+#: rpmqv.c:202
+msgid "rebuild database inverted lists from installed package headers"
+msgstr ""
+
+#: rpmqv.c:205
+msgid "generate headers compatible with (legacy) rpm[23] packaging"
+msgstr ""
+
+#: lib/poptBT.c:176 rpmqv.c:208
+msgid "generate headers compatible with rpm4 packaging"
+msgstr ""
+
+#: rpmqv.c:256
+msgid "<package>"
+msgstr ""
+
+#: rpmqv.c:261 rpmqv.c:632
+msgid "skip files with leading component <path> "
+msgstr ""
+
+#: rpmqv.c:267
+msgid "upgrade package if already installed"
+msgstr ""
+
+#: rpmqv.c:268 rpmqv.c:286 rpmqv.c:325
+msgid "<packagefile>+"
+msgstr ""
+
+#: rpmqv.c:297 rpmqv.c:606
+msgid "do not execute scripts (if any)"
+msgstr ""
+
+#: rpmqv.c:300 rpmqv.c:654
+msgid "don't execute any scriptlets triggered by this package"
+msgstr ""
+
+#: rpmqv.c:313
+msgid "<oldpath>=<newpath>"
+msgstr ""
+
+#: rpmqv.c:324
+msgid "upgrade package"
+msgstr ""
+
+#: rpmqv.c:348
+msgid "Query/Verify options:"
+msgstr ""
+
+#: rpmqv.c:352
+msgid "Query options (with -q or --query):"
+msgstr ""
+
+#: rpmqv.c:355
+msgid "Verify options (with -V or --verify):"
+msgstr ""
+
+#: rpmqv.c:361
+msgid "Signature options:"
+msgstr ""
+
+#: rpmqv.c:367
+msgid "Database options:"
+msgstr ""
+
+#: rpmqv.c:373
+msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
+msgstr ""
+
+#: rpmqv.c:378
+msgid "Common options for all rpm modes:"
+msgstr ""
+
+#: rpmqv.c:418
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:300
+#: rpmqv.c:422
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:301
+#: rpmqv.c:423
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:305
+#: rpmqv.c:427
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:308
+#: rpmqv.c:430
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:317
+#: rpmqv.c:439
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:325
+#: rpmqv.c:447
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:332
+#: rpmqv.c:454
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:339
+#: rpmqv.c:461
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:343
+#: rpmqv.c:465
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:344
+#: rpmqv.c:466
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:348
-#, c-format
-msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:350
-msgid "                        [--target=platform1[,platform2...]]"
-msgstr ""
-
-#: rpmqv.c:351
-msgid "                        [--rmsource] [--rmspec] specfile"
-msgstr ""
-
-#: rpmqv.c:352
-#, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr ""
-
-#: rpmqv.c:353
-#, c-format
-msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:354
-#, c-format
-msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:355
-#, c-format
-msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr ""
-
-#: rpmqv.c:359
+#: rpmqv.c:470
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:360
+#: rpmqv.c:471
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:472
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:405
+#: rpmqv.c:516
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:517
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:519
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:409
+#: rpmqv.c:520
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:521
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:412
+#: rpmqv.c:523
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:413
+#: rpmqv.c:524
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:528
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:419
+#: rpmqv.c:530
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:540
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:430
+#: rpmqv.c:541
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:542
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:544
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:546
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:437
+#: rpmqv.c:548
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:443
+#: rpmqv.c:554
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:445
+#: lib/poptQV.c:68 rpmqv.c:556
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:557
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:558
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:559
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:560
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:561
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:562
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:563
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:564
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:454
+#: rpmqv.c:565
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:455
+#: rpmqv.c:566
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:459
+#: rpmqv.c:570
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:462
+#: rpmqv.c:573
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:589
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:591
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:593
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:484
+#: rpmqv.c:595
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:495
-msgid "do not execute verify script (if any)"
-msgstr ""
-
-#: rpmqv.c:510
+#: rpmqv.c:621
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:511
+#: rpmqv.c:622
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:520
+#: rpmqv.c:631
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:521
-msgid "skip files with leading component <path> "
-msgstr ""
-
-#: rpmqv.c:541
+#: rpmqv.c:652
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:543
-msgid "don't execute any scriptlets triggered by this package"
-msgstr ""
-
-#: rpmqv.c:546
+#: rpmqv.c:657
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:659
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:668
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:669
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:674
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:582
-msgid "   -b<stage> <spec>       "
-msgstr ""
-
-#: rpmqv.c:583
-msgid "   -t<stage> <tarball>    "
-msgstr ""
-
-#: rpmqv.c:598
-msgid "package src rpm only"
-msgstr ""
-
-#: rpmqv.c:609
-msgid "     --buildroot <dir>    "
-msgstr ""
-
-#: rpmqv.c:611
-msgid "     --target=<platform>+ "
-msgstr ""
-
-#: rpmqv.c:616
-msgid "   --rebuild <src_pkg>    "
-msgstr ""
-
-#: rpmqv.c:618
-msgid "   --recompile <src_pkg>  "
-msgstr ""
-
-#: rpmqv.c:624
+#: rpmqv.c:693
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:626
+#: rpmqv.c:695
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:629
+#: rpmqv.c:698
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:630
+#: rpmqv.c:699
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:712
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:645
+#: rpmqv.c:714
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:932
+#: rpmqv.c:1001
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1007
+#: rpmqv.c:1076
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:1163
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1262
+#: rpmqv.c:1322
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1391
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1333
+#: rpmqv.c:1393
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2742,108 +2776,135 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:84
+#: lib/poptBT.c:95
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:110
-msgid "build through %%prep stage from spec file"
+#: lib/poptBT.c:121
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:112
-msgid "build through %%build stage from spec file"
+#: lib/poptBT.c:122 lib/poptBT.c:125 lib/poptBT.c:128 lib/poptBT.c:131
+#: lib/poptBT.c:134 lib/poptBT.c:137 lib/poptBT.c:140
+msgid "<specfile>"
 msgstr ""
 
-#: lib/poptBT.c:114
-msgid "build through %%install stage from spec file"
+#: lib/poptBT.c:124
+msgid "build through %build (%prep, then compile) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:116
-msgid "verify %%files section from spec file"
+#: lib/poptBT.c:127
+msgid "build through %install (%prep, %build, then install) from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:118
-msgid "build source and binary package from spec file"
+#: lib/poptBT.c:130
+#, c-format
+msgid "verify %files section from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:120
-msgid "build binary package from spec file"
+#: lib/poptBT.c:133
+msgid "build source and binary packages from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:122
-msgid "build source package from spec file"
+#: lib/poptBT.c:136
+msgid "build binary package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:125
-msgid "build through %%prep stage from tar ball"
+#: lib/poptBT.c:139
+msgid "build source package only from <specfile>"
 msgstr ""
 
-#: lib/poptBT.c:127
-msgid "build through %%build stage from tar ball"
+#: lib/poptBT.c:143
+#, c-format
+msgid "build through %prep (unpack sources and apply patches) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:129
-msgid "build through %%install stage from tar ball"
+#: lib/poptBT.c:144 lib/poptBT.c:147 lib/poptBT.c:150 lib/poptBT.c:153
+#: lib/poptBT.c:156 lib/poptBT.c:159 lib/poptBT.c:162
+msgid "<tarball>"
 msgstr ""
 
-#: lib/poptBT.c:131
-msgid "verify %%files section from tar ball"
+#: lib/poptBT.c:146
+msgid "build through %build (%prep, then compile) from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:133
-msgid "build source and binary package from tar ball"
+#: lib/poptBT.c:149
+msgid "build through %install (%prep, %build, then install) from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:152
+#, c-format
+msgid "verify %files section from <tarball>"
+msgstr ""
+
+#: lib/poptBT.c:155
+msgid "build source and binary packages from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:135
-msgid "build binary package from tar ball"
+#: lib/poptBT.c:158
+msgid "build binary package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:137
-msgid "build source package from tar ball"
+#: lib/poptBT.c:161
+msgid "build source package only from <tarball>"
 msgstr ""
 
-#: lib/poptBT.c:140
-msgid "build binary package from source package"
+#: lib/poptBT.c:165
+msgid "build binary package from <source package>"
 msgstr ""
 
-#: lib/poptBT.c:142
-msgid "build through %%install stage from source package"
+#: lib/poptBT.c:166 lib/poptBT.c:169
+msgid "<source package>"
 msgstr ""
 
-#: lib/poptBT.c:145
+#: lib/poptBT.c:168
+msgid ""
+"build through %install (%prep, %build, then install) from <source package>"
+msgstr ""
+
+#: lib/poptBT.c:172
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:149
+#: lib/poptBT.c:178
+msgid "ignore ExcludeArch: directives from spec file"
+msgstr ""
+
+#: lib/poptBT.c:180
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:151
-msgid "do not accept I18N msgstr's from specfile"
+#: lib/poptBT.c:184
+msgid "generate package header(s) compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
-#: lib/poptBT.c:155
+#: lib/poptBT.c:187
+msgid "do not accept i18N msgstr's from specfile"
+msgstr ""
+
+#: lib/poptBT.c:191
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:159
+#: lib/poptBT.c:197
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:161
-msgid "lookup I18N strings in specfile catalog"
+#: lib/poptBT.c:199
+msgid "lookup i18N strings in specfile catalog"
 msgstr ""
 
 #: lib/poptQV.c:70
-msgid "query/verify package owning file"
+msgid "query/verify package(s) owning file"
 msgstr ""
 
 #: lib/poptQV.c:72
-msgid "query/verify packages in group"
+msgid "query/verify package(s) in group"
 msgstr ""
 
 #: lib/poptQV.c:74
-msgid "query/verify a package file"
+msgid "query/verify a package file (i.e. a binary *.rpm file)"
 msgstr ""
 
 #: lib/poptQV.c:76
@@ -2858,8 +2919,12 @@ msgstr ""
 msgid "query a spec file"
 msgstr ""
 
+#: lib/poptQV.c:82
+msgid "<spec>"
+msgstr ""
+
 #: lib/poptQV.c:84
-msgid "query the pacakges triggered by the package"
+msgid "query the package(s) triggered by the package"
 msgstr ""
 
 #: lib/poptQV.c:86
@@ -2871,42 +2936,42 @@ msgid "rpm verify mode (legacy)"
 msgstr ""
 
 #: lib/poptQV.c:90
-msgid "query the packages which require a capability"
+msgid "query/verify the package(s) which require a dependency"
 msgstr ""
 
 #: lib/poptQV.c:92
-msgid "query the packages which provide a capability"
+msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:138
+#: lib/poptQV.c:140
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:148
+#: lib/poptQV.c:150
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -3766,24 +3831,28 @@ msgstr ""
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d"
 msgstr ""
 
-#: lib/verify.c:44
+#: lib/verify.c:59
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/verify.c:219
+#: lib/verify.c:65
+msgid "do not execute %verifyscript (if any)"
+msgstr ""
+
+#: lib/verify.c:241
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:237
+#: lib/verify.c:259
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
 
-#: lib/verify.c:299
+#: lib/verify.c:321
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:380
+#: lib/verify.c:402
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
diff --git a/popt/po/cs.po b/popt/po/cs.po
index b453b9f30..ab883d565 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vypí¹e tuto nápovìdu"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vypí¹e krátký návod k pou¾ití"
diff --git a/popt/po/da.po b/popt/po/da.po
index 348e8c2ec..9f59184b6 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hjælpemeddelelse"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
diff --git a/popt/po/de.po b/popt/po/de.po
index 92426ed88..192688a29 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/es.po b/popt/po/es.po
index 92426ed88..192688a29 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/fi.po b/popt/po/fi.po
index 92426ed88..192688a29 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/fr.po b/popt/po/fr.po
index 92426ed88..192688a29 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/gl.po b/popt/po/gl.po
index 38f28935d..a6be50c02 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilización"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index d90a9ee6e..bc2e38859 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "E súgó megjelenítése"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Rövid használati utasítás megjelenítése"
diff --git a/popt/po/id.po b/popt/po/id.po
index 92426ed88..192688a29 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/is.po b/popt/po/is.po
index 6d6d63ded..f4c93e784 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Sýna þessa hjálp"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Sýna stuttar notkunarleiðbeiningar"
diff --git a/popt/po/it.po b/popt/po/it.po
index 92426ed88..192688a29 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/ja.po b/popt/po/ja.po
index 92426ed88..192688a29 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/ko.po b/popt/po/ko.po
index 92426ed88..192688a29 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/no.po b/popt/po/no.po
index 4864b4168..25370fbf8 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 92426ed88..192688a29 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index acd8de004..502a3967b 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/pt.po b/popt/po/pt.po
index 9b10b57e3..22fc2f454 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utilização sucinta"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index 92426ed88..192688a29 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/ro.po b/popt/po/ro.po
index c721649aa..03ade3305 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,11 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
diff --git a/popt/po/ru.po b/popt/po/ru.po
index f8f053b92..782048953 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "ðÏËÁÚÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "ðÏËÁÚÁÔØ ËÒÁÔËÕÀ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index d17e68373..9081bc879 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vypísa» túto správu"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Zobrazi» struèný návod na pou¾itie"
diff --git a/popt/po/sl.po b/popt/po/sl.po
index d33261225..42e359bf5 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Prika¾i to sporoèilo s pomoèjo"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Prika¾i kratko sporoèilo o uporabi"
diff --git a/popt/po/sr.po b/popt/po/sr.po
index 92426ed88..192688a29 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/sv.po b/popt/po/sv.po
index e2f13287f..b5bf6d3ac 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Visa detta hjälpmeddelande"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Visa ett kortfattat användningsmeddelande"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index e5280342f..700abc260 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Görkem Çetin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.Þ <gorkem@gelecek.com.tr>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Bu yardým iletisini gösterir"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Kýsa bir kullaným iletisi göster"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 913a46a67..9d7f4350f 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "ðÏËÁÚÁÔÉ ÃÀ ÄÏצÄËÕ"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ"
diff --git a/popt/po/wa.po b/popt/po/wa.po
index c0c7ef51e..297f21411 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos è siervi"
diff --git a/popt/po/zh.po b/popt/po/zh.po
index 92426ed88..192688a29 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 64932fa1d..0a7948411 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "ÏÔʾÕâÌõ°ïÖúÐÅÏ¢"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "ÏÔʾ¼ò¶ÌʹÓÃÐÅÏ¢"
diff --git a/popt/popt.c b/popt/popt.c
index d67e31373..15e3eee01 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -31,7 +31,7 @@ static char * strerror(int errno) {
 #endif
 
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
-    if (con->execPath) xfree(con->execPath);
+    if (con->execPath) free((void *)con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
 }
@@ -140,11 +140,11 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 static void cleanOSE(struct optionStackEntry *os)
 {
     if (os->nextArg) {
-	xfree(os->nextArg);
+	free((void *)os->nextArg);
 	os->nextArg = NULL;
     }
     if (os->argv) {
-	xfree(os->argv);
+	free((void *)os->argv);
 	os->argv = NULL;
     }
     if (os->argb) {
@@ -175,7 +175,7 @@ void poptResetContext(poptContext con) {
 
     for (i = 0; i < con->finalArgvCount; i++) {
 	if (con->finalArgv[i]) {
-	    xfree(con->finalArgv[i]);
+	    free((void *)con->finalArgv[i]);
 	    con->finalArgv[i] = NULL;
 	}
     }
@@ -661,7 +661,7 @@ int poptGetNextOpt(poptContext con)
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (con->os->nextArg) {
-		xfree(con->os->nextArg);
+		free((void *)con->os->nextArg);
 		con->os->nextArg = NULL;
 	    }
 	    if (longArg) {
@@ -831,22 +831,22 @@ void poptFreeContext(poptContext con) {
     if (con->os->argb) free(con->os->argb);
 
     for (i = 0; i < con->numAliases; i++) {
-	if (con->aliases[i].longName) xfree(con->aliases[i].longName);
+	if (con->aliases[i].longName) free((void *)con->aliases[i].longName);
 	free(con->aliases[i].argv);
     }
 
     for (i = 0; i < con->numExecs; i++) {
-	if (con->execs[i].longName) xfree(con->execs[i].longName);
-	xfree(con->execs[i].script);
+	if (con->execs[i].longName) free((void *)con->execs[i].longName);
+	free((void *)con->execs[i].script);
     }
-    if (con->execs) xfree(con->execs);
+    if (con->execs) free((void *)con->execs);
 
     free(con->leftovers);
     free(con->finalArgv);
-    if (con->appName) xfree(con->appName);
+    if (con->appName) free((void *)con->appName);
     if (con->aliases) free(con->aliases);
-    if (con->otherHelp) xfree(con->otherHelp);
-    if (con->execPath) xfree(con->execPath);
+    if (con->otherHelp) free((void *)con->otherHelp);
+    if (con->execPath) free((void *)con->execPath);
     if (con->arg_strip) PBM_FREE(con->arg_strip);
     
     free(con);
diff --git a/popt/popt.h b/popt/popt.h
index 5bae6793b..2bb83adf0 100644
--- a/popt/popt.h
+++ b/popt/popt.h
@@ -74,25 +74,26 @@ extern "C" {
 #define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /* options can't follow args */
 
 struct poptOption {
-    /*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
+/*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argInfo;
-    /*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
+/*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
-    /*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
-    /*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
+/*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
+/*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
 };
 
 struct poptAlias {
-    /*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
+/*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argc;
-    /*@owned@*/ const char ** argv;		/* must be free()able */
+/*@owned@*/ const char ** argv;		/* must be free()able */
 };
 
 extern struct poptOption poptHelpOptions[];
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-			0, "Help options", NULL },
+			0, "Help options:", NULL },
+#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
 
 typedef struct poptContext_s * poptContext;
 #ifndef __cplusplus
diff --git a/popt/popthelp.c b/popt/popthelp.c
index 12fb484ea..25cb79141 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -14,8 +14,9 @@
 static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
 		struct poptOption * key, 
-		/*@unused@*/ const char * arg, /*@unused@*/ void * data) {
-    if (key->shortName== '?')
+		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
+{
+    if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
     else
 	poptPrintUsage(con, stdout, 0);
@@ -26,7 +27,7 @@ struct poptOption poptHelpOptions[] = {
     { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
     { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
     { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
-    { NULL, '\0', 0, NULL, 0, NULL, NULL }
+    POPT_TABLEEND
 } ;
 
 
@@ -69,25 +70,28 @@ getArgDescrip(const struct poptOption * opt, const char *translation_domain)
 
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
 			     const struct poptOption * opt,
-			     const char *translation_domain) {
+			     const char *translation_domain)
+{
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
+    const char * argDescrip = getArgDescrip(opt, translation_domain);
     int helpLength;
-    const char * ch;
-    char format[10];
     char * left;
-    const char * argDescrip = getArgDescrip(opt, translation_domain);
 
     left = malloc(maxLeftCol + 1);
     left[0] = left[maxLeftCol] = '\0';
 
     if (opt->longName && opt->shortName)
-	snprintf(left, maxLeftCol, "-%c, --%s", opt->shortName, opt->longName);
+	snprintf(left, maxLeftCol, "-%c, %s%s", opt->shortName,
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		opt->longName);
     else if (opt->shortName) 
 	snprintf(left, maxLeftCol, "-%c", opt->shortName);
     else if (opt->longName)
-	snprintf(left, maxLeftCol, "--%s", opt->longName);
+	snprintf(left, maxLeftCol, "%s%s",
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		opt->longName);
     if (!*left) return ;
     if (argDescrip) {
 	char * le = left + strlen(left);
@@ -145,6 +149,9 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 
     helpLength = strlen(help);
     while (helpLength > lineLength) {
+	const char * ch;
+	char format[10];
+
 	ch = help + lineLength - 1;
 	while (ch > help && !isspace(*ch)) ch--;
 	if (ch == help) break;		/* give up */
@@ -165,7 +172,8 @@ out:
 }
 
 static int maxArgWidth(const struct poptOption * opt,
-		       const char * translation_domain) {
+		       const char * translation_domain)
+{
     int max = 0;
     int this;
     const char * s;
@@ -175,15 +183,19 @@ static int maxArgWidth(const struct poptOption * opt,
 	    this = maxArgWidth(opt->arg, translation_domain);
 	    if (this > max) max = this;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    this = opt->shortName ? 2 : 0;
+	    this = sizeof("  ")-1;
+	    if (opt->shortName) this += sizeof("-X")-1;
+	    if (opt->shortName && opt->longName) this += sizeof(", ")-1;
 	    if (opt->longName) {
-		if (this) this += 2;
-		this += strlen(opt->longName) + 2;
+		this += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
+			? sizeof("-")-1 : sizeof("--")-1);
+		this += strlen(opt->longName);
 	    }
 
 	    s = getArgDescrip(opt, translation_domain);
 	    if (s)
-		this += strlen(s) + 1;
+		this += sizeof("=")-1 + strlen(s);
+	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) this += sizeof("[]")-1;
 	    if (this > max) max = this;
 	}
 
@@ -195,20 +207,18 @@ static int maxArgWidth(const struct poptOption * opt,
 
 static void singleTableHelp(FILE * f, const struct poptOption * table, 
 			    int left,
-			    const char *translation_domain) {
+			    const char *translation_domain)
+{
     const struct poptOption * opt;
     const char *sub_transdom;
 
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
 	    singleOptionHelp(f, left, opt, translation_domain);
-	opt++;
     }
 
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    sub_transdom = getTableTranslationDomain(opt->arg);
 	    if(!sub_transdom)
@@ -219,18 +229,18 @@ static void singleTableHelp(FILE * f, const struct poptOption * table,
 
 	    singleTableHelp(f, opt->arg, left, sub_transdom);
 	}
-	opt++;
     }
 }
 
-static int showHelpIntro(poptContext con, FILE * f) {
+static int showHelpIntro(poptContext con, FILE * f)
+{
     int len = 6;
     const char * fn;
 
     fprintf(f, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 	fn = con->optionStack->argv[0];
-	if (strchr(fn, '/')) fn = strchr(fn, '/') + 1;
+	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
 	fprintf(f, " %s", fn);
 	len += strlen(fn) + 1;
     }
@@ -238,7 +248,8 @@ static int showHelpIntro(poptContext con, FILE * f) {
     return len;
 }
 
-void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
+void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
+{
     int leftColWidth;
 
     showHelpIntro(con, f);
@@ -253,7 +264,8 @@ void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
 
 static int singleOptionUsage(FILE * f, int cursor, 
 			     const struct poptOption * opt,
-			     const char *translation_domain) {
+			     const char *translation_domain)
+{
     int len = 3;
     char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
@@ -263,7 +275,7 @@ static int singleOptionUsage(FILE * f, int cursor,
 	if (!(opt->argInfo & POPT_ARG_MASK)) 
 	    return cursor;	/* we did these already */
 	len++;
-	*shortStr = opt->shortName;
+	shortStr[0] = opt->shortName;
 	shortStr[1] = '\0';
     } else if (opt->longName) {
 	len += 1 + strlen(opt->longName);
@@ -280,36 +292,33 @@ static int singleOptionUsage(FILE * f, int cursor,
 	cursor = 7;
     } 
 
-    fprintf(f, " [-%s%s%s%s]", opt->shortName ? "" : "-", item,
-	    argDescrip ? (opt->shortName ? " " : "=") : "",
-	    argDescrip ? argDescrip : "");
+    fprintf(f, " [-%s%s%s%s]",
+	((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
+	item,
+	(argDescrip ? (opt->shortName ? " " : "=") : ""),
+	(argDescrip ? argDescrip : ""));
 
     return cursor + len + 1;
 }
 
-static int singleTableUsage(FILE * f, int cursor, const struct poptOption * table,
-		     const char *translation_domain) {
-    const struct poptOption * opt;
-    
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+static int singleTableUsage(FILE * f, int cursor,
+	const struct poptOption * opt, const char * translation_domain)
+{
+    for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
         if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN)
 	    translation_domain = (const char *)opt->arg;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) 
-	    cursor = singleTableUsage(f, cursor, opt->arg,
-				      translation_domain);
+	    cursor = singleTableUsage(f, cursor, opt->arg, translation_domain);
 	else if ((opt->longName || opt->shortName) && 
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	  cursor = singleOptionUsage(f, cursor, opt, translation_domain);
-
-	opt++;
+	    cursor = singleOptionUsage(f, cursor, opt, translation_domain);
     }
 
     return cursor;
 }
 
-static int showShortOptions(const struct poptOption * opt, FILE * f, 
-			    char * str) {
+static int showShortOptions(const struct poptOption * opt, FILE * f, char * str)
+{
     char s[300];		/* this is larger then the ascii set, so
 				   it should do just fine */
 
@@ -319,13 +328,11 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
 	str = s;
     }
 
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
 	    str[strlen(str)] = opt->shortName;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
 	    showShortOptions(opt->arg, f, str);
-
-	opt++;
     } 
 
     if (s != str || !*s)
@@ -335,7 +342,8 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
     return strlen(s) + 4;
 }
 
-void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
+void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags)
+{
     int cursor;
 
     cursor = showHelpIntro(con, f);
@@ -352,6 +360,6 @@ void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
 }
 
 void poptSetOtherOptionHelp(poptContext con, const char * text) {
-    if (con->otherHelp) xfree(con->otherHelp);
+    if (con->otherHelp) free((void *)con->otherHelp);
     con->otherHelp = xstrdup(text);
 }
diff --git a/popt/poptint.h b/popt/poptint.h
index a37a9b925..066e14312 100644
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -27,12 +27,12 @@ typedef struct {
 
 struct optionStackEntry {
     int argc;
-    /*@only@*/ const char ** argv;
-    /*@only@*/ pbm_set * argb;
+/*@only@*/ const char ** argv;
+/*@only@*/ pbm_set * argb;
     int next;
-    /*@only@*/ const char * nextArg;
-    /*@keep@*/ const char * nextCharArg;
-    /*@dependent@*/ struct poptAlias * currAlias;
+/*@only@*/ const char * nextArg;
+/*@keep@*/ const char * nextCharArg;
+/*@dependent@*/ struct poptAlias * currAlias;
     int stuffed;
 };
 
@@ -44,30 +44,28 @@ struct execEntry {
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
-    /*@dependent@*/ struct optionStackEntry * os;
-    /*@owned@*/ const char ** leftovers;
+/*@dependent@*/ struct optionStackEntry * os;
+/*@owned@*/ const char ** leftovers;
     int numLeftovers;
     int nextLeftover;
-    /*@keep@*/ const struct poptOption * options;
+/*@keep@*/ const struct poptOption * options;
     int restLeftover;
-    /*@only@*/ const char * appName;
-    /*@only@*/ struct poptAlias * aliases;
+/*@only@*/ const char * appName;
+/*@only@*/ struct poptAlias * aliases;
     int numAliases;
     int flags;
     struct execEntry * execs;
     int numExecs;
-    /*@only@*/ const char ** finalArgv;
+/*@only@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-    /*@dependent@*/ struct execEntry * doExec;
-    /*@only@*/ const char * execPath;
+/*@dependent@*/ struct execEntry * doExec;
+/*@only@*/ const char * execPath;
     int execAbsolute;
-    /*@only@*/ const char * otherHelp;
+/*@only@*/ const char * otherHelp;
     pbm_set * arg_strip;
 };
 
-#define	xfree(_a)	free((void *)_a)
-
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
@@ -82,8 +80,8 @@ struct poptContext_s {
 #define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
-#define POPT_(foo) (foo)
 #define D_(dom, str) (str)
+#define POPT_(foo) (foo)
 #endif
 
 #define N_(foo) (foo)
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 034f62d35..f6778be3e 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -417,7 +417,7 @@ static void mungeFilelist(Header h)
     headerAddEntry(h, RPMTAG_OLDFILENAMES, RPM_STRING_ARRAY_TYPE,
 			fileNames, count);
 
-    xfree(fileNames);
+    free((void *)fileNames);
 }
 
 static int psGetArchScore(Header h) {
diff --git a/rpm.spec b/rpm.spec
index b3155eea8..6aa5efe5f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0.2
 Version: %{version}
-Release: 0.13
+Release: 0.14
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -309,6 +309,9 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Mon Jan  1 2001 Jeff Johnson <jbj@redhat.com>
+- use popt autohelp for rpm helper binaries.
+
 * Sun Dec 31 2000 Jeff Johnson <jbj@redhat.com>
 - (popt): fix float/double handling (#19701).
 - (popt): non-linux needs <float.h> (#22732).
diff --git a/rpm.spec.in b/rpm.spec.in
index a1f60a17e..895d069d5 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version @VERSION@
 Version: %{version}
-Release: 0.13
+Release: 0.14
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -309,6 +309,9 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Mon Jan  1 2001 Jeff Johnson <jbj@redhat.com>
+- use popt autohelp for rpm helper binaries.
+
 * Sun Dec 31 2000 Jeff Johnson <jbj@redhat.com>
 - (popt): fix float/double handling (#19701).
 - (popt): non-linux needs <float.h> (#22732).
diff --git a/rpmqv.c b/rpmqv.c
index 4ae68cc40..cc14e16a6 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -1,5 +1,7 @@
 #include "system.h"
 
+#define	_AUTOHELP
+
 #if defined(IAM_RPM)
 #define	IAM_RPMBT
 #define	IAM_RPMDB
@@ -129,7 +131,7 @@ static int signIt = 0;
 static int noMd5 = 0;
 #endif
 
-#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+#if defined(IAM_RPMEIU)
 static int noDeps = 0;
 #endif
 
@@ -137,127 +139,247 @@ static int noDeps = 0;
 static int noScripts = 0;
 #endif
 
-#if defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+#if defined(IAM_RPMEIU)
 static int force = 0;
 static int test = 0;
 #endif
 
-/* the structure describing the options we take and the defaults */
-static struct poptOption optionsTable[] = {
- { "help", '\0', 0, &help, 0,			NULL, NULL},
- { "version", '\0', 0, &showVersion, 0,		NULL, NULL},
-
- { "quiet", '\0', 0, &quiet, 0,			NULL, NULL},
- { "verbose", 'v', 0, 0, 'v',			NULL, NULL},
-
- { "define", '\0', POPT_ARG_STRING, 0, GETOPT_DEFINEMACRO,
-	N_("define macro <name> with value <body>"), N_("'<name> <body>'") },
- { "eval", '\0', POPT_ARG_STRING, 0, GETOPT_EVALMACRO,
-	N_("print macro expansion to stdout"), N_("<expr>+") },
-
- { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,	NULL, NULL},
- { "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0,	NULL, NULL},
-#if HAVE_LIBIO_H && defined(_IO_BAD_SEEN)
- { "nolibio", '\0', POPT_ARG_VAL, &noLibio, 1,		NULL, NULL},
-#endif
- { "ftpdebug", '\0', POPT_ARG_VAL, &_ftp_debug, -1,		NULL, NULL},
- { "rpmiodebug", '\0', POPT_ARG_VAL, &_rpmio_debug, -1,		NULL, NULL},
- { "urldebug", '\0', POPT_ARG_VAL, &_url_debug, -1,		NULL, NULL},
-
-#if defined(IAM_RPMEIU) || defined(IAM_RPMBT)
- { "force", '\0', 0, &force, 0,			NULL, NULL},
- { "test", '\0', 0, &test, 0,			NULL, NULL},
-#endif
-
- /* XXX colliding options */
-#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
- {  NULL, 'i', 0, 0, 'i',			NULL, NULL},
-#endif
-
- { "pipe", '\0', POPT_ARG_STRING, &pipeOutput, 0,	NULL, NULL},
- { "root", 'r', POPT_ARG_STRING, &rootdir, 0,	NULL, NULL},
-
+static struct poptOption rpmAllPoptTable[] = {
+ { "version", '\0', 0, &showVersion, 0,
+	N_("print the version of rpm being used"),
+	NULL },
+ { "quiet", '\0', 0, &quiet, 0,
+	N_("provide less detailed output"), NULL},
+ { "verbose", 'v', 0, 0, 'v',
+	N_("provide more detailed output"), NULL},
+ { "define", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, 0, GETOPT_DEFINEMACRO,
+	N_("define macro <name> with value <body>"),
+	N_("'<name> <body>'") },
+ { "eval", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, 0, GETOPT_EVALMACRO,
+	N_("print macro expansion of <expr>+"),
+	N_("<expr>+") },
+ { "pipe", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, &pipeOutput, 0,
+	N_("send stdout to <cmd>"),
+	N_("<cmd>") },
+ { "root", 'r', POPT_ARG_STRING, &rootdir, 0,
+	N_("use <dir> as the top level directory"),
+	N_("<dir>") },
  { "macros", '\0', POPT_ARG_STRING, &macrofiles, 0,
 	N_("read <file:...> instead of default macro file(s)"),
 	N_("<file:...>") },
 #ifndef	DYING
- { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0,	NULL, NULL},
+ { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0,
+	N_("read <file:...> instead of default rpmrc file(s)"),
+	N_("<file:...>") },
 #else
- { "rcfile", '\0', 0, 0, GETOPT_RCFILE,		NULL, NULL},
-#endif
- { "showrc", '\0', 0, &showrc, GETOPT_SHOWRC,	NULL, NULL},
-
-#if defined(IAM_RPMQV) || defined(IAM_RPMK)
- { "nomd5", '\0', 0, &noMd5, 0,			NULL, NULL},
-#endif
-
-#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
- { "nodeps", '\0', 0, &noDeps, 0,		NULL, NULL},
-#endif
-#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
- { "noscripts", '\0', 0, &noScripts, 0,		NULL, NULL},
+ { "rcfile", '\0', 0, 0, GETOPT_RCFILE,	
+	N_("read <file:...> instead of default rpmrc file(s)"),
+	N_("<file:...>") },
 #endif
+ { "showrc", '\0', 0, &showrc, GETOPT_SHOWRC,
+	N_("display final rpmrc and macro configuration"),
+	NULL },
 
-#ifdef	IAM_RPMK
- { "addsign", '\0', 0, 0, GETOPT_ADDSIGN,	NULL, NULL},
- { "checksig", 'K', 0, 0, 'K',			NULL, NULL},
- { "nogpg", '\0', 0, &noGpg, 0,			NULL, NULL},
- { "nopgp", '\0', 0, &noPgp, 0,			NULL, NULL},
- { "resign", '\0', 0, 0, GETOPT_RESIGN,		NULL, NULL},
+#if HAVE_LIBIO_H && defined(_IO_BAD_SEEN)
+ { "nolibio", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noLibio, 1,
+	N_("disable use of libio(3) API"), NULL},
 #endif
-
-#if defined(IAM_RPMBT) || defined(IAM_RPMK)
- { "sign", '\0', 0, &signIt, 0,			NULL, NULL},
-#endif	/* IAM_RPMBT || IAM_RPMK */
+ { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1,
+	N_("debug protocol data stream"), NULL},
+ { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1,
+	N_("debug rpmio I/O"), NULL},
+ { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1,
+	N_("debug URL cache handling"), NULL},
+
+   POPT_TABLEEND
+};
 
 #ifdef	IAM_RPMDB
- { "initdb", '\0', 0, &initdb, 0,		NULL, NULL},
- { "rebuilddb", '\0', 0, 0, GETOPT_REBUILDDB,	NULL, NULL},
+static struct poptOption rpmDatabasePoptTable[] = {
+ { "initdb", '\0', 0, &initdb, 0,
+	N_("initialize database"), NULL},
+ { "rebuilddb", '\0', 0, 0, GETOPT_REBUILDDB,
+	N_("rebuild database inverted lists from installed package headers"),
+	NULL},
+ { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,
+	N_("generate headers compatible with (legacy) rpm[23] packaging"),
+	NULL},
+ { "dirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 0,
+	N_("generate headers compatible with rpm4 packaging"),
+	NULL},
+
+   POPT_TABLEEND
+};
 #endif	/* IAM_RPMDB */
 
+#ifdef	IAM_RPMK
+static struct poptOption rpmSignPoptTable[] = {
+ { "addsign", '\0', 0, 0, GETOPT_ADDSIGN,
+	N_("add a signature to a package"),
+	NULL },
+ { "resign", '\0', 0, 0, GETOPT_RESIGN,
+	N_("sign a package (discard current signature)"),
+	NULL },
+ { "sign", '\0', 0, &signIt, 0,
+	N_("generate PGP/GPG signature"),
+	NULL },
+ { "checksig", 'K', 0, 0, 'K',
+	N_("verify package signature"),
+	NULL },
+ { "nogpg", '\0', 0, &noGpg, 0,
+	N_("skip any PGP signatures"),
+	NULL },
+ { "nopgp", '\0', 0, &noPgp, 0,
+	N_("skip any GPG signatures"),
+	NULL },
+ { "nomd5", '\0', 0, &noMd5, 0,
+	N_("do not verify file md5 checksums"),
+	NULL },
+
+   POPT_TABLEEND
+};
+#endif	/* IAM_RPMK */
+
 #ifdef	IAM_RPMEIU
- { "allfiles", '\0', 0, &allFiles, 0,		NULL, NULL},
- { "allmatches", '\0', 0, &allMatches, 0,	NULL, NULL},
- { "badreloc", '\0', 0, &badReloc, 0,		NULL, NULL},
- { "erase", 'e', 0, 0, 'e',			NULL, NULL},
- { "excludedocs", '\0', 0, &excldocs, 0,	NULL, NULL},
- { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH,	NULL, NULL},
- { "freshen", 'F', 0, 0, 'F',			NULL, NULL},
- { "hash", 'h', 0, &showHash, 0,		NULL, NULL},
- { "ignorearch", '\0', 0, &ignoreArch, 0,	NULL, NULL},
- { "ignoreos", '\0', 0, &ignoreOs, 0,		NULL, NULL},
- { "ignoresize", '\0', 0, &ignoreSize, 0,	NULL, NULL},
- { "includedocs", '\0', 0, &incldocs, 0,	NULL, NULL},
-/* info and install both using 'i' is dumb */
- { "install", '\0', 0, 0, GETOPT_INSTALL,	NULL, NULL},
- { "justdb", '\0', 0, &justdb, 0,		NULL, NULL},
- { "noorder", '\0', 0, &noOrder, 0,		NULL, NULL},
- { "notriggers", '\0', 0, &noTriggers, 0,	NULL, NULL},
- { "oldpackage", '\0', 0, &oldPackage, 0,	NULL, NULL},
- { "percent", '\0', 0, &showPercents, 0,	NULL, NULL},
- { "prefix", '\0', POPT_ARG_STRING, &prefix, 0,	NULL, NULL},
- { "relocate", '\0', POPT_ARG_STRING, 0, GETOPT_RELOCATE,	NULL, NULL},
- { "replacefiles", '\0', 0, &replaceFiles, 0,	NULL, NULL},
- { "replacepkgs", '\0', 0, &replacePackages, 0,	NULL, NULL},
- { "upgrade", 'U', 0, 0, 'U',			NULL, NULL},
- { "uninstall", 'u', 0, 0, 'u',			NULL, NULL},
+static struct poptOption rpmInstallPoptTable[] = {
+ { "allfiles", '\0', 0, &allFiles, 0,
+  N_("install all files, even configurations which might otherwise be skipped"),
+	NULL},
+ { "allmatches", '\0', 0, &allMatches, 0,
+	N_("remove all packages which match <package> (normally an error is generated if <package> specified multiple packages)"),
+	NULL},
+ { "badreloc", '\0', 0, &badReloc, 0,
+	N_("relocate files in non-relocateable package"),
+	NULL},
+ { "erase", 'e', 0, 0, 'e',
+	N_("erase (uninstall) package"),
+	N_("<package>") },
+ { "excludedocs", '\0', 0, &excldocs, 0,
+	N_("do not install documentation"),
+	NULL},
+ { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH,
+	N_("skip files with leading component <path> "),
+	NULL},
+ { "force", '\0', 0, &force, 0,
+	N_("short hand for --replacepkgs --replacefiles"),
+	NULL},
+ { "freshen", 'F', 0, 0, 'F',
+	N_("upgrade package if already installed"),
+	N_("<packagefile>+") },
+ { "hash", 'h', 0, &showHash, 0,
+	N_("print hash marks as package installs (good with -v)"),
+	NULL},
+ { "ignorearch", '\0', 0, &ignoreArch, 0,
+	N_("don't verify package architecture"),
+	NULL},
+ { "ignoreos", '\0', 0, &ignoreOs, 0,
+	N_("don't verify package operating system"),
+	NULL},
+ { "ignoresize", '\0', 0, &ignoreSize, 0,
+	N_("don't check disk space before installing"),
+	NULL},
+ { "includedocs", '\0', 0, &incldocs, 0,
+	N_("install documentation"),
+	NULL},
+ { "install", '\0', 0, 0, GETOPT_INSTALL,
+	N_("install package"),
+	N_("<packagefile>+") },
+ { "justdb", '\0', 0, &justdb, 0,
+	N_("update the database, but do not modify the filesystem"),
+	NULL},
+ { "nodeps", '\0', 0, &noDeps, 0,
+	N_("do not verify package dependencies"),
+	NULL },
+ { "noorder", '\0', 0, &noOrder, 0,
+	N_("do not reorder package installation to satisfy dependencies"),
+	NULL},
+ { "noscripts", '\0', 0, &noScripts, 0,
+	N_("do not execute scripts (if any)"),
+	NULL },
+ { "notriggers", '\0', 0, &noTriggers, 0,
+	N_("don't execute any scriptlets triggered by this package"),
+	NULL},
+ { "oldpackage", '\0', 0, &oldPackage, 0,
+	N_("upgrade to an old version of the package (--force on upgrades does this automatically)"),
+	NULL},
+ { "percent", '\0', 0, &showPercents, 0,
+	N_("print percentages as package installs"),
+	NULL},
+ { "prefix", '\0', POPT_ARG_STRING, &prefix, 0,
+	N_("relocate the package to <dir>, if relocatable"),
+	N_("<dir>") },
+ { "relocate", '\0', POPT_ARG_STRING, 0, GETOPT_RELOCATE,
+	N_("relocate files from <oldpath> to <newpath>"),
+	N_("<oldpath>=<newpath>") },
+ { "replacefiles", '\0', 0, &replaceFiles, 0,
+	N_("install even if the package replaces installed files"),
+	NULL},
+ { "replacepkgs", '\0', 0, &replacePackages, 0,
+	N_("reinstall if the package is already present"),
+	NULL},
+ { "test", '\0', 0, &test, 0,
+	N_("don't install, but tell if it would work or not"),
+	NULL},
+ { "upgrade", 'U', 0, 0, 'U',
+	N_("upgrade package"),
+	N_("<packagefile>+") },
+ { "uninstall", 'u', POPT_ARGFLAG_DOC_HIDDEN, 0, 'u',
+	NULL,
+	NULL},
+
+   POPT_TABLEEND
+};
 #endif	/* IAM_RPMEIU */
 
+/* the structure describing the options we take and the defaults */
+static struct poptOption optionsTable[] = {
+#if !defined(_AUTOHELP)
+ { "help", '\0', 0, &help, 0,			NULL, NULL},
+#endif
+
+ /* XXX colliding options */
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+ {  NULL, 'i', POPT_ARGFLAG_DOC_HIDDEN, 0, 'i',			NULL, NULL},
+#endif
+
 #ifdef	IAM_RPMQV
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
-		rpmQVSourcePoptTable, 0,	(void *) &rpmQVArgs, NULL },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
-		rpmQueryPoptTable, 0,		(void *) &rpmQVArgs, NULL },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
-		rpmVerifyPoptTable, 0,		(void *) &rpmQVArgs, NULL },
+#if 0
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
+	N_("Query/Verify options:"),
+	NULL },
+#endif
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQueryPoptTable, 0,
+	N_("Query options (with -q or --query):"),
+	NULL },
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmVerifyPoptTable, 0,
+	N_("Verify options (with -V or --verify):"),
+	NULL },
 #endif	/* IAM_RPMQV */
 
+#ifdef	IAM_RPMK
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmSignPoptTable, 0,
+	N_("Signature options:"),
+	NULL },
+#endif	/* IAM_RPMK */
+
+#ifdef	IAM_RPMDB
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmDatabasePoptTable, 0,
+	N_("Database options:"),
+	NULL },
+#endif	/* IAM_RPMDB */
+
 #ifdef	IAM_RPMBT
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, 
-		rpmBuildPoptTable, 0,		(void *) &rpmBTArgs, NULL },
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmBuildPoptTable, 0,
+	N_("Build options with [ <specfile> | <tarball> | <source package> ]:"),
+	NULL },
 #endif	/* IAM_RPMBT */
 
- { 0, 0, 0, 0, 0,	NULL, NULL }
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmAllPoptTable, 0,
+	N_("Common options for all rpm modes:"),
+	NULL },
+
+   POPT_AUTOHELP
+   POPT_TABLEEND
 };
 
 #ifdef __MINT__
@@ -344,17 +466,6 @@ static void printUsage(void) {
     fprintf(fp, _("       %s {--setugids} [-afpg] [target]\n"), __progname);
 #endif	/* IAM_RPMQV */
 
-#ifdef	IAM_RPMBT
-    fprintf(fp, _("       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros <file:...>]\n"), __progname);
-    puts( ("                        [--sign] [--nobuild] ]"));
-    puts(_("                        [--target=platform1[,platform2...]]"));
-    puts(_("                        [--rmsource] [--rmspec] specfile"));
-    fprintf(fp, _("       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"), __progname);
-    fprintf(fp, _("       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
-    fprintf(fp, _("       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... sourceN.rpm\n"), __progname);
-    fprintf(fp, _("       %s {--freshen -F} file1.rpm ... fileN.rpm\n"), __progname);
-#endif	/* IAM_RPMBT */
-
 #ifdef	IAM_RPMK
     fprintf(fp, _("       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"), __progname);
     fprintf(fp, _("       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"), __progname);
@@ -492,7 +603,7 @@ static void printHelp(void) {
     printHelpLine(  "     --nomd5              ",
 		  _("do not verify file md5 checksums"));
     printHelpLine(  "     --noscripts          ",
-		  _("do not execute verify script (if any)"));
+		  _("do not execute scripts (if any)"));
     puts("");
     printHelpLine(  "   --querytags            ",
 		  _("list the tags that can be used in a query format"));
@@ -577,48 +688,6 @@ static void printHelp(void) {
 		  _("don't execute any scripts triggered by this package"));
 #endif	/* IAM_RPMEIU */
 
-#ifdef	IAM_RPMBT
-    puts("");
-    puts(         _("   -b<stage> <spec>       "));
-    printHelpLine(_("   -t<stage> <tarball>    "),
-		  _("build package, where <stage> is one of:"));
-    printHelpLine(  "         p                ",
-		  _("prep (unpack sources and apply patches)"));
-    printHelpLine(  "         l                ",
-		  _("list check (do some cursory checks on %files)"));
-    printHelpLine(  "         c                ",
-		  _("compile (prep and compile)"));
-    printHelpLine(  "         i                ",
-		  _("install (prep, compile, install)"));
-    printHelpLine(  "         b                ",
-		  _("binary package (prep, compile, install, package)"));
-    printHelpLine(  "         a                ",
-		  _("bin/src package (prep, compile, install, package)"));
-    printHelpLine(  "         s                ",
-		  _("package src rpm only"));
-    printHelpLine(  "     --short-circuit      ",
-		  _("skip straight to specified stage (only for c,i)"));
-    printHelpLine(  "     --clean              ",
-		  _("remove build tree when done"));
-    printHelpLine(  "     --rmsource           ",
-		  _("remove sources when done"));
-    printHelpLine(  "     --rmspec             ",
-		  _("remove spec file when done"));
-    printHelpLine(  "     --sign               ",
-		  _("generate PGP/GPG signature"));
-    printHelpLine(_("     --buildroot <dir>    "),
-		  _("use <dir> as the build root"));
-    printHelpLine(_("     --target=<platform>+ "),
-		  _("build the packages for the build targets platform1...platformN."));
-    printHelpLine(  "     --nobuild            ",
-		  _("do not execute any stages"));
-    puts("");
-    printHelpLine(_("   --rebuild <src_pkg>    "),
-		  _("install source package, build binary package and remove spec file, sources, patches, and icons."));
-    printHelpLine(_("   --recompile <src_pkg>  "),
-		  _("like --rebuild, but don't build any package"));
-#endif	/* IAM_RPMBT */
-
 #ifdef IAM_RPMK
     puts("");
     printHelpLine(_("   --resign <pkg>+        "),
@@ -1007,21 +1076,11 @@ int main(int argc, const char ** argv)
 	argerror(_("--dbpath given for operation that does not use a "
 			"database"));
 
-#if defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+#if defined(IAM_RPMEIU)
 
-    if (!(
-#ifdef	IAM_RPMEIU
-	 bigMode == MODE_INSTALL ||
-#endif
-#ifdef	IAM_RPMBT
-	 (bigMode==MODE_BUILD && (ba->buildAmount & RPMBUILD_RMSOURCE))||
-	 (bigMode==MODE_BUILD && (ba->buildAmount & RPMBUILD_RMSPEC))
-#else
-	0
-#endif
-	) && force)
+    if (!( bigMode == MODE_INSTALL ) && force)
 	argerror(_("only installation, upgrading, rmsource and rmspec may be forced"));
-#endif	/* IAM_RPMEIU || IAM_RPMBT */
+#endif	/* IAM_RPMEIU */
 
 #ifdef	IAM_RPMEIU
     if (bigMode != MODE_INSTALL && badReloc)
@@ -1103,9 +1162,7 @@ int main(int argc, const char ** argv)
     if (bigMode != MODE_INSTALL && bigMode != MODE_UNINSTALL && noTriggers)
 	argerror(_("--notriggers may only be specified during package "
 		   "installation and erasure"));
-#endif	/* IAM_RPMEIU */
 
-#if defined(IAM_RPMBT) || defined(IAM_RPMEIU)
     if (noDeps & (bigMode & ~MODES_FOR_NODEPS))
 	argerror(_("--nodeps may only be specified during package "
 		   "building, rebuilding, recompilation, installation,"
@@ -1114,7 +1171,7 @@ int main(int argc, const char ** argv)
     if (test && (bigMode & ~MODES_FOR_TEST))
 	argerror(_("--test may only be specified during package installation, "
 		 "erasure, and building"));
-#endif	/* IAM_RPMBT || IAM_RPMEIU */
+#endif	/* IAM_RPMEIU */
 
     if (rootdir[1] && (bigMode & ~MODES_FOR_ROOT))
 	argerror(_("--root (-r) may only be specified during "
@@ -1154,6 +1211,9 @@ int main(int argc, const char ** argv)
 #endif
 
 #if defined(IAM_RPMBT) || defined(IAM_RPMK)
+#if defined(IAM_RPMBT)
+    signIt = ba->sign;
+#endif
     if (signIt) {
         if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD ||
 	    bigMode == MODE_RESIGN || bigMode == MODE_TARBUILD) {
@@ -1279,7 +1339,7 @@ int main(int argc, const char ** argv)
 		break;
 
 	    ba->rootdir = rootdir;
-	    ec = build(specFile, ba, passPhrase, 0, cookie, rcfile, force, noDeps);
+	    ec = build(specFile, ba, passPhrase, cookie, rcfile);
 	    free(cookie);
 	    cookie = NULL;
 	    free((void *)specFile);
@@ -1335,8 +1395,7 @@ int main(int argc, const char ** argv)
 
 	while ((pkg = poptGetArg(optCon))) {
 	    ba->rootdir = rootdir;
-	    ec = build(pkg, ba, passPhrase, bigMode == MODE_TARBUILD,
-			NULL, rcfile, force, noDeps);
+	    ec = build(pkg, ba, passPhrase, NULL, rcfile);
 	    if (ec)
 		break;
 	    rpmFreeMacros(NULL);
@@ -1468,9 +1527,11 @@ int main(int argc, const char ** argv)
 
 	verifyFlags = (VERIFY_FILES|VERIFY_DEPS|VERIFY_SCRIPT|VERIFY_MD5);
 	verifyFlags &= ~qva->qva_flags;
+#ifdef DYING
 	if (noDeps)	verifyFlags &= ~VERIFY_DEPS;
 	if (noScripts)	verifyFlags &= ~VERIFY_SCRIPT;
 	if (noMd5)	verifyFlags &= ~VERIFY_MD5;
+#endif
 
 	qva->qva_prefix = rootdir;
 	qva->qva_flags = verifyFlags;