- popt: display sub-table options only once on --usage.

- wire --nosignatures et al as common options, rework CLI options.

CVS patchset: 5575
CVS date: 2002/07/28 00:41:15

78 files changed, 9155 insertions, 9591 deletions

diff --git a/CHANGES b/CHANGES
index 225e19356..bffcf8a89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -187,6 +187,8 @@
 	- popt: fix --usage (#62234).
 	- fix: --repackage repaired (#67217).
 	- fix: rpm2cpio disables signature checks (i.e. same behavior).
+	- popt: display sub-table options only once on --usage.
+	- wire --nosignatures et al as common options, rework CLI options.
 
 4.0.3 -> 4.0.4:
 	- solaris: translate i86pc to i386 (#57182).
diff --git a/build/poptBT.c b/build/poptBT.c
index 972f25f5b..179a40d75 100644
--- a/build/poptBT.c
+++ b/build/poptBT.c
@@ -24,9 +24,7 @@ struct rpmBuildArguments_s         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
@@ -50,9 +48,6 @@ struct rpmBuildArguments_s         rpmBTArgs;
 extern int _fsm_debug;
 /*@=redecl@*/
 
-/*@unchecked@*/
-static int force = 0;
-
 /*@-exportlocal@*/
 /*@unchecked@*/
 int noLang = 0;
@@ -62,9 +57,6 @@ int noLang = 0;
 static int noBuild = 0;
 
 /*@unchecked@*/
-static int noDeps = 0;
-
-/*@unchecked@*/
 static int signIt = 0;
 
 /*@unchecked@*/
@@ -102,9 +94,8 @@ static void buildArgCallback( /*@unused@*/ poptContext con,
 	    rba->buildChar = (opt->val     ) & 0xff;
 	}
 	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;
@@ -130,6 +121,15 @@ static void buildArgCallback( /*@unused@*/ poptContext con,
 	}
 	strcat(rba->targets, arg);
 	break;
+
+    case RPMCLI_POPT_NODEPS:
+	rba->noDeps = 1;
+	break;
+
+    case RPMCLI_POPT_FORCE:
+	rba->force = 1;
+	break;
+
     }
 }
 /*@=boundswrite@*/
@@ -140,7 +140,7 @@ static void buildArgCallback( /*@unused@*/ poptContext con,
 /*@unchecked@*/
 struct poptOption rpmBuildPoptTable[] = {
 /*@-type@*/ /* FIX: cast? */
- { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE,
 	buildArgCallback, 0, NULL, NULL },
 /*@=type@*/
 
@@ -201,13 +201,13 @@ struct poptOption rpmBuildPoptTable[] = {
 	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,
+ { "force", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmBTArgs.force, RPMCLI_POPT_FORCE,
         N_("ignore ExcludeArch: directives from spec file"), NULL},
  { "fsmdebug", '\0', (POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN), &_fsm_debug, -1,
 	N_("debug file state machine"), NULL},
  { "nobuild", '\0', 0, &noBuild,  POPT_NOBUILD,
 	N_("do not execute any stages of the build"), NULL },
- { "nodeps", '\0', 0, &noDeps, POPT_NODEPS,
+ { "nodeps", '\0', 0, NULL, RPMCLI_POPT_NODEPS,
 	N_("do not verify build dependencies"), NULL },
  { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,
 	N_("generate package header(s) compatible with (legacy) rpm[23] packaging"),
diff --git a/db3/configure b/db3/configure
index a96fb90d3..eea649b27 100755
--- a/db3/configure
+++ b/db3/configure
@@ -26,7 +26,7 @@ listobjs:\
 \
 distdir install check:\
 \
-db3_install: all install_setip \\' > Makefile
+db3_install: all install_setip' > Makefile
 
 mv db.h db.h.orig
 cat db.h.orig | sed \
diff --git a/lib/package.c b/lib/package.c
index d0ea23a40..0ff90c98a 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -26,7 +26,7 @@
 /*@access rpmts @*/
 /*@access Header @*/		/* XXX compared with NULL */
 /*@access entryInfo @*/		/* XXX headerCheck */
-/*@access indexEntry @*/		/* XXX headerCheck */
+/*@access indexEntry @*/	/* XXX headerCheck */
 /*@access FD_t @*/		/* XXX stealing digests */
 
 /*@unchecked@*/
diff --git a/lib/poptALL.c b/lib/poptALL.c
index 221409db9..65c97dd45 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -18,14 +18,22 @@
 /*@unchecked@*/
 static int _debug = 0;
 
+/*@-exportheadervar@*/
+/*@unchecked@*/
+extern int noLibio;
+/*@=exportheadervar@*/
+
+/*@unchecked@*/
+const char * rpmcliPipeOutput = NULL;
+
+/*@unchecked@*/
+const char * rpmcliRcfile = NULL;
+
 /*@unchecked@*/
-/*@observer@*/ /*@null@*/
-static const char * pipeOutput = NULL;
+const char * rpmcliRootDir = "/";
+
 /*@unchecked@*/
-/*@observer@*/ /*@null@*/
-static const char * rcfile = NULL;
-/*@unchecked@*/ /*@observer@*/
-static const char * rootdir = "/";
+rpmQueryFlags rpmcliQueryFlags;
 
 /*@-exportheadervar@*/
 /*@unchecked@*/
@@ -39,11 +47,11 @@ extern int _rpmio_debug;
 /**
  * Display rpm version.
  */
-static void printVersion(void)
+static void printVersion(FILE * fp)
 	/*@globals rpmEVR, fileSystem @*/
 	/*@modifies fileSystem @*/
 {
-    fprintf(stdout, _("RPM version %s\n"), rpmEVR);
+    fprintf(fp, _("RPM version %s\n"), rpmEVR);
 }
 
 /**
@@ -51,7 +59,7 @@ static void printVersion(void)
  * @warning Options like --rcfile and --verbose must precede callers option.
  */
 /*@mayexit@*/
-static void rpmcliConfigured(void)
+void rpmcliConfigured(void)
 	/*@globals rpmCLIMacroContext, rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@modifies rpmCLIMacroContext, rpmGlobalMacroContext,
@@ -60,7 +68,7 @@ static void rpmcliConfigured(void)
     static int initted = -1;
 
     if (initted < 0)
-	initted = rpmReadConfigFiles(rcfile, NULL);
+	initted = rpmReadConfigFiles(rpmcliRcfile, NULL);
     if (initted)
 	exit(EXIT_FAILURE);
 }
@@ -77,11 +85,6 @@ static void rpmcliAllArgCallback( /*@unused@*/ poptContext con,
 	/*@modifies rpmCLIMacroContext, rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 {
-#if 0
-/*@observer@*/
-static const char *cbreasonstr[] = { "PRE", "POST", "OPTION", "?WTFO?" };
-fprintf(stderr, "*** rpmcliALL: -%c,--%s %s %s opt %p arg %p val %d\n", opt->shortName, opt->longName, arg, cbreasonstr[reason&0x3], opt, opt->arg, opt->val);
-#endif
 
     /* XXX avoid accidental collisions with POPT_BIT_SET for flags */
     /*@-branchstate@*/
@@ -108,7 +111,7 @@ fprintf(stderr, "*** rpmcliALL: -%c,--%s %s %s opt %p arg %p val %d\n", opt->sho
 	}
 	break;
     case POPT_SHOWVERSION:
-	printVersion();
+	printVersion(stdout);
 	exit(EXIT_SUCCESS);
 	/*@notreached@*/ break;
     case POPT_SHOWRC:
@@ -120,6 +123,17 @@ fprintf(stderr, "*** rpmcliALL: -%c,--%s %s %s opt %p arg %p val %d\n", opt->sho
     case POPT_RCFILE:		/* XXX FIXME: noop for now */
 	break;
 #endif
+    case RPMCLI_POPT_NODIGEST:
+	rpmcliQueryFlags |= VERIFY_DIGEST;
+	break;
+
+    case RPMCLI_POPT_NOSIGNATURE:
+	rpmcliQueryFlags |= VERIFY_SIGNATURE;
+	break;
+
+    case RPMCLI_POPT_NOHDRCHK:
+	rpmcliQueryFlags |= VERIFY_HDRCHK;
+	break;
     }
     /*@=branchstate@*/
 }
@@ -128,18 +142,12 @@ fprintf(stderr, "*** rpmcliALL: -%c,--%s %s %s opt %p arg %p val %d\n", opt->sho
 /*@unchecked@*/
 struct poptOption rpmcliAllPoptTable[] = {
 /*@-type@*/ /* FIX: cast? */
- { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE,
         rpmcliAllArgCallback, 0, NULL, NULL },
 /*@=type@*/
 
  { "debug", 'd', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_debug, -1,
         NULL, NULL },
- { "quiet", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'q',
-	N_("provide less detailed output"), NULL},
- { "verbose", 'v', 0, 0, 'v',
-	N_("provide more detailed output"), NULL},
- { "version", '\0', 0, 0, POPT_SHOWVERSION,
-	N_("print the version of rpm being used"), NULL },
 
  { "define", 'D', POPT_ARG_STRING, 0, 'D',
 	N_("define MACRO with value EXPR"),
@@ -147,35 +155,58 @@ struct poptOption rpmcliAllPoptTable[] = {
  { "eval", 'E', POPT_ARG_STRING, 0, 'E',
 	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|POPT_ARGFLAG_SHOW_DEFAULT | POPT_ARGFLAG_DOC_HIDDEN, &rootdir, 0,
-	N_("use <dir> as the top level directory"),
-	N_("<dir>") },
- { "macros", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, &macrofiles, 0,
+ { "macros", '\0', POPT_ARG_STRING, &macrofiles, 0,
 	N_("read <FILE:...> instead of default file(s)"),
 	N_("<FILE:...>") },
+
+ { "nodigest", '\0', 0, 0, RPMCLI_POPT_NODIGEST,
+        N_("don't verify package digest(s)"), NULL },
+ { "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOHDRCHK,
+        N_("don't verify database header(s) when retrieved"), NULL },
+#if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
+ { "nolibio", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noLibio, 1,
+	N_("disable use of libio(3) API"), NULL},
+#endif
+ { "nosignature", '\0', 0, 0, RPMCLI_POPT_NOSIGNATURE,
+        N_("don't verify package signature(s)"), NULL },
+
+ { "pipe", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, &rpmcliPipeOutput, 0,
+	N_("send stdout to CMD"),
+	N_("CMD") },
 #if !defined(POPT_RCFILE)
- { "rcfile", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, &rcfile, 0,
+ { "rcfile", '\0', POPT_ARG_STRING, &rpmcliRcfile, 0,
 	N_("read <FILE:...> instead of default file(s)"),
 	N_("<FILE:...>") },
 #else
- { "rcfile", '\0', 0, 0, POPT_RCFILE|POPT_ARGFLAG_DOC_HIDDEN,	
+ { "rcfile", '\0', 0, NULL, POPT_RCFILE,	
 	N_("read <FILE:...> instead of default file(s)"),
 	N_("<FILE:...>") },
 #endif
- { "showrc", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_SHOWRC,
+ { "root", 'r', POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT, &rpmcliRootDir, 0,
+	N_("use ROOT as top level directory"),
+	N_("ROOT") },
+
+ { "showrc", '\0', 0, NULL, POPT_SHOWRC,
 	N_("display final rpmrc and macro configuration"),
 	NULL },
+ { "quiet", '\0', 0, NULL, 'q',
+	N_("provide less detailed output"), NULL},
+ { "verbose", 'v', 0, NULL, 'v',
+	N_("provide more detailed output"), NULL},
+ { "version", '\0', 0, NULL, POPT_SHOWVERSION,
+	N_("print the version of rpm being used"), NULL },
 
 #if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
  { "nolibio", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noLibio, 1,
-	N_("disable use of libio(3) API"), NULL},
+       N_("disable use of libio(3) API"), NULL},
 #endif
 
  { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1,
 	N_("debug protocol data stream"), NULL},
+#ifdef	DYING
+ { "poptdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_popt_debug, -1,
+	N_("debug option/argument processing"), NULL},
+#endif
  { "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,
diff --git a/lib/poptI.c b/lib/poptI.c
index 50c4da069..a0c1e6e5f 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -78,6 +78,7 @@ static void installArgCallback( /*@unused@*/ poptContext con,
 /*@=kepttrans =usereleased @*/
 	ia->numRelocations++;
       }	break;
+
     case POPT_ROLLBACK:
       {	time_t tid;
 	if (arg == NULL)
@@ -91,6 +92,39 @@ static void installArgCallback( /*@unused@*/ poptContext con,
 	    argerror(_("malformed rollback time/date stamp argument"));
 	ia->rbtid = tid;
       }	break;
+
+    case RPMCLI_POPT_NODIGEST:
+	ia->qva_flags |= VERIFY_DIGEST;
+	break;
+
+    case RPMCLI_POPT_NOSIGNATURE:
+	ia->qva_flags |= VERIFY_SIGNATURE;
+	break;
+
+    case RPMCLI_POPT_NOHDRCHK:
+	ia->qva_flags |= VERIFY_HDRCHK;
+	break;
+
+    case RPMCLI_POPT_NODEPS:
+	ia->noDeps = 1;
+	break;
+
+    case RPMCLI_POPT_NOMD5:
+	ia->transFlags |= RPMTRANS_FLAG_NOMD5;
+	break;
+
+    case RPMCLI_POPT_FORCE:
+	ia->probFilter |=
+		( RPMPROB_FILTER_REPLACEPKG
+		| RPMPROB_FILTER_REPLACEOLDFILES
+		| RPMPROB_FILTER_REPLACENEWFILES
+		| RPMPROB_FILTER_OLDPACKAGE );
+	break;
+
+    case RPMCLI_POPT_NOSCRIPTS:
+	ia->transFlags |= (_noTransScripts | _noTransTriggers);
+	break;
+
     }
     /*@=branchstate@*/
 }
@@ -102,7 +136,7 @@ static void installArgCallback( /*@unused@*/ poptContext con,
 /*@unchecked@*/
 struct poptOption rpmInstallPoptTable[] = {
 /*@-type@*/ /* FIX: cast? */
- { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE,
 	installArgCallback, 0, NULL, NULL },
 /*@=type@*/
 
@@ -135,9 +169,16 @@ struct poptOption rpmInstallPoptTable[] = {
  { "excludepath", '\0', POPT_ARG_STRING, 0, POPT_EXCLUDEPATH,
 	N_("skip files with leading component <path> "),
 	N_("<path>") },
+
+#ifdef	DYING
  { "force", '\0', POPT_BIT_SET, &rpmIArgs.probFilter,
 	(RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES | RPMPROB_FILTER_OLDPACKAGE),
 	N_("short hand for --replacepkgs --replacefiles"), NULL},
+#else
+ { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE,
+	N_("short hand for --replacepkgs --replacefiles"), NULL},
+#endif
+
  { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags,
 	(INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL),
 	N_("upgrade package(s) if already installed"),
@@ -160,8 +201,15 @@ struct poptOption rpmInstallPoptTable[] = {
 	N_("install package(s)"), N_("<packagefile>+") },
  { "justdb", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_JUSTDB,
 	N_("update the database, but do not modify the filesystem"), NULL},
+#ifdef	DYING
  { "nodeps", '\0', 0, &rpmIArgs.noDeps, 0,
 	N_("do not verify package dependencies"), NULL },
+#else
+ { "nodeps", '\0', 0, NULL, RPMCLI_POPT_NODEPS,
+	N_("do not verify package dependencies"), NULL },
+#endif
+ { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOMD5,
+	N_("don't verify MD5 digest of files"), NULL },
  { "noorder", '\0', POPT_BIT_SET,
 	&rpmIArgs.installInterfaceFlags, INSTALL_NOORDER,
 	N_("do not reorder package installation to satisfy dependencies"),
@@ -171,9 +219,14 @@ struct poptOption rpmInstallPoptTable[] = {
 	RPMTRANS_FLAG_NOSUGGEST,
 	N_("do not suggest missing dependency resolution(s)"), NULL},
 
+#ifdef	DYING
  { "noscripts", '\0', POPT_BIT_SET, &rpmIArgs.transFlags,
 	(_noTransScripts|_noTransTriggers),
 	N_("do not execute package scriptlet(s)"), NULL },
+#else
+ { "noscripts", '\0', 0, NULL, RPMCLI_POPT_NOSCRIPTS,
+	N_("do not execute package scriptlet(s)"), NULL },
+#endif
  { "nopre", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags,
 	RPMTRANS_FLAG_NOPRE,
 	N_("do not execute %%pre scriptlet (if any)"), NULL },
@@ -187,15 +240,23 @@ struct poptOption rpmInstallPoptTable[] = {
 	RPMTRANS_FLAG_NOPOSTUN,
 	N_("do not execute %%postun scriptlet (if any)"), NULL },
 
+#ifdef	DYING
  { "nodigest", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_DIGEST,
         N_("don't verify package digest(s)"), NULL },
  { "nohdrchk", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.qva_flags, VERIFY_HDRCHK,
         N_("don't verify database header(s) when retrieved"), NULL },
  { "nosignature", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_SIGNATURE,
         N_("don't verify package signature(s)"), NULL },
+#else
+ { "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NODIGEST,
+        N_("don't verify package digest(s)"), NULL },
+ { "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOHDRCHK,
+        N_("don't verify database header(s) when retrieved"), NULL },
+ { "nosignature", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOSIGNATURE,
+        N_("don't verify package signature(s)"), NULL },
+#endif
 
- { "notriggers", '\0', POPT_BIT_SET, &rpmIArgs.transFlags,
-	_noTransTriggers,
+ { "notriggers", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, _noTransTriggers,
 	N_("do not execute any scriptlet(s) triggered by this package"), NULL},
  { "notriggerprein", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
 	&rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERPREIN,
diff --git a/lib/poptQV.c b/lib/poptQV.c
index 48ed031d0..6b519b7f6 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -104,7 +104,7 @@ struct poptOption rpmQVSourcePoptTable[] = {
  { "hdrid", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_QUERYBYHDRID,
 	N_("query/verify package(s) with header identifier"), "SHA1" },
  { "package", 'p', 0, 0, 'p',
-	N_("query/verify a package file (i.e. a binary *.rpm file)"), NULL },
+	N_("query/verify a package file"), NULL },
  { "pkgid", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_QUERYBYPKGID,
 	N_("query/verify package(s) with package identifier"), "MD5" },
  { "query", 'q', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'q',
@@ -147,11 +147,6 @@ static void queryArgCallback(/*@unused@*/poptContext con,
 	break;
     case POPT_DUMP: qva->qva_flags |= QUERY_FOR_DUMPFILES | QUERY_FOR_LIST;
 	break;
-    case 'v':
-	/*@-internalglobs@*/ /* FIX: shrug */
-	rpmIncreaseVerbosity();
-	/*@=internalglobs@*/
-	break;
 
     case POPT_QUERYFORMAT:
 	if (arg) {
@@ -171,6 +166,41 @@ static void queryArgCallback(/*@unused@*/poptContext con,
 	    qva->qva_queryFormat = qf;
 	}
 	break;
+
+    case RPMCLI_POPT_NODIGEST:
+	qva->qva_flags |= VERIFY_DIGEST;
+	break;
+
+    case RPMCLI_POPT_NOSIGNATURE:
+	qva->qva_flags |= VERIFY_SIGNATURE;
+	break;
+
+    case RPMCLI_POPT_NOHDRCHK:
+	qva->qva_flags |= VERIFY_HDRCHK;
+	break;
+
+    case RPMCLI_POPT_NODEPS:
+	qva->qva_flags |= VERIFY_DEPS;
+	break;
+
+    case RPMCLI_POPT_NOMD5:
+	qva->qva_flags |= VERIFY_MD5;
+	break;
+
+#ifdef	NOTYET
+    case RPMCLI_POPT_FORCE:
+	ia->probFilter |=
+		( RPMPROB_FILTER_REPLACEPKG
+		| RPMPROB_FILTER_REPLACEOLDFILES
+		| RPMPROB_FILTER_REPLACENEWFILES
+		| RPMPROB_FILTER_OLDPACKAGE );
+	break;
+#endif
+
+    case RPMCLI_POPT_NOSCRIPTS:
+	qva->qva_flags |= VERIFY_SCRIPT;
+	break;
+
     }
 }
 
@@ -180,7 +210,7 @@ static void queryArgCallback(/*@unused@*/poptContext con,
 /*@unchecked@*/
 struct poptOption rpmQueryPoptTable[] = {
 /*@-type@*/ /* FIX: cast? */
- { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE, 
 	queryArgCallback, 0, NULL, NULL },
 /*@=type@*/
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
@@ -215,8 +245,6 @@ struct poptOption rpmQueryPoptTable[] = {
 	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
 };
 
@@ -224,13 +252,22 @@ struct poptOption rpmQueryPoptTable[] = {
  * Verify mode options.
  */
 struct poptOption rpmVerifyPoptTable[] = {
+/*@-type@*/ /* FIX: cast? */
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE, 
+	queryArgCallback, 0, NULL, NULL },
+/*@=type@*/
  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmQVSourcePoptTable, 0,
 	NULL, NULL },
 
  /* Duplicate file verify flags from packages into command line options. */
 /** @todo Add --nomd5 alias to rpmpopt, eliminate. */
+#ifdef	DYING
  { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_MD5,
 	N_("don't verify MD5 digest of files"), NULL },
+#else
+ { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOMD5,
+	N_("don't verify MD5 digest of files"), NULL },
+#endif
  { "nosize", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
 	&rpmQVKArgs.qva_flags, VERIFY_SIZE,
         N_("don't verify size of files"), NULL },
@@ -255,16 +292,31 @@ struct poptOption rpmVerifyPoptTable[] = {
 
  { "nofiles", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_FILES,
 	N_("don't verify files in package"), NULL},
+#ifdef	DYING
  { "nodeps", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DEPS,
 	N_("don't verify package dependencies"), NULL },
+#else
+ { "nodeps", '\0', 0, NULL, RPMCLI_POPT_NODEPS,
+	N_("don't verify package dependencies"), NULL },
+#endif
+
+#ifdef	DYING
  { "noscript", '\0', POPT_BIT_SET,&rpmQVKArgs.qva_flags, VERIFY_SCRIPT,
         N_("don't execute verify script(s)"), NULL },
  /* XXX legacy had a trailing s on --noscript */
  { "noscripts", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
 	&rpmQVKArgs.qva_flags, VERIFY_SCRIPT,
         N_("don't execute verify script(s)"), NULL },
- { "nodigest", '\0', POPT_BIT_SET,
-	&rpmQVKArgs.qva_flags, VERIFY_DIGEST,
+#else
+ { "noscript", '\0', 0, NULL, RPMCLI_POPT_NOSCRIPTS,
+        N_("don't execute verify script(s)"), NULL },
+ /* XXX legacy had a trailing s on --noscript */
+ { "noscripts", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NOSCRIPTS,
+        N_("don't execute verify script(s)"), NULL },
+#endif
+
+#ifdef	DYING
+ { "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST,
         N_("don't verify package digest(s)"), NULL },
  { "nohdrchk", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
 	&rpmQVKArgs.qva_flags, VERIFY_HDRCHK,
@@ -272,6 +324,14 @@ struct poptOption rpmVerifyPoptTable[] = {
  { "nosignature", '\0', POPT_BIT_SET,
 	&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
         N_("don't verify package signature(s)"), NULL },
+#else
+ { "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NODIGEST,
+        N_("don't verify package digest(s)"), NULL },
+ { "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOHDRCHK,
+        N_("don't verify database header(s) when retrieved"), NULL },
+ { "nosignature", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOSIGNATURE,
+        N_("don't verify package signature(s)"), NULL },
+#endif
 
 /** @todo Add --nogpg/--nopgp aliases to rpmpopt, eliminate. */
  { "nogpg", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
@@ -290,7 +350,7 @@ struct poptOption rpmVerifyPoptTable[] = {
 /*@unchecked@*/
 struct poptOption rpmSignPoptTable[] = {
 /*@-type@*/ /* FIX: cast? */
- { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
+ { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE,
 	rpmQVSourceArgCallback, 0, NULL, NULL },
 /*@=type@*/
  { "addsign", '\0', 0, NULL, 'A',
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index a54c922fe..f0eee647f 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -27,6 +27,15 @@ extern "C" {
 /*@unchecked@*/
 extern struct poptOption		rpmcliAllPoptTable[];
 
+/*@unchecked@*/ /*@observer@*/ /*@null@*/
+extern const char * rpmcliPipeOutput;
+
+/*@unchecked@*/ /*@observer@*/ /*@null@*/
+extern const char * rpmcliRcfile;
+
+/*@unchecked@*/ /*@observer@*/ /*@null@*/
+extern const char * rpmcliRootDir;
+
 /**
  * Initialize most everything needed by an rpm CLI executable context.
  * @param argc			no. of args
@@ -43,6 +52,17 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
 		fileSystem, internalState @*/;
 
 /**
+ * Make sure that rpm configuration has been read.
+ * @warning Options like --rcfile and --verbose must precede callers option.
+ */
+/*@mayexit@*/
+void rpmcliConfigured(void)
+	/*@globals rpmCLIMacroContext, rpmGlobalMacroContext,
+		fileSystem, internalState @*/
+	/*@modifies rpmCLIMacroContext, rpmGlobalMacroContext,
+		fileSystem, internalState @*/;
+
+/**
  * Destroy most everything needed by an rpm CLI executable context.
  * @param optCon		popt context
  * @return			NULL always
@@ -51,6 +71,17 @@ poptContext
 rpmcliFini(/*@only@*/ /*@null@*/ poptContext optCon)
 	/*@modifies optCon @*/;
 
+/**
+ * Common/global popt tokens used for command line option tables.
+ */
+#define	RPMCLI_POPT_NODEPS		-1025
+#define	RPMCLI_POPT_FORCE		-1026
+#define	RPMCLI_POPT_NOMD5		-1027
+#define	RPMCLI_POPT_NOSCRIPTS		-1028
+#define	RPMCLI_POPT_NOSIGNATURE		-1029
+#define	RPMCLI_POPT_NODIGEST		-1030
+#define	RPMCLI_POPT_NOHDRCHK		-1031
+
 /* ==================================================================== */
 /** \name RPMBT */
 /*@{*/
@@ -181,6 +212,12 @@ typedef enum rpmQueryFlags_e {
     QUERY_FOR_DUMPFILES)
 
 /** \ingroup rpmcli
+ * Bit(s) from common command line options.
+ */
+/*@unchecked@*/
+extern rpmQueryFlags rpmcliQueryFlags;
+
+/** \ingroup rpmcli
  * Bit(s) to control rpmVerify() operation, stored in qva_flags.
  * @todo Merge rpmQueryFlags, rpmVerifyFlags, and rpmVerifyAttrs values?.
  */
@@ -472,17 +509,17 @@ struct rpmInstallArguments_s {
     rpmprobFilterFlags probFilter;
     rpmInstallInterfaceFlags installInterfaceFlags;
     rpmEraseInterfaceFlags eraseInterfaceFlags;
-/*@owned@*/ /*@null@*/
-    rpmRelocation * relocations;
+    rpmQueryFlags qva_flags;	/*!< from --nodigest/--nosignature */
+    uint_32 rbtid;		/*!< from --rollback */
     int numRelocations;
     int noDeps;
     int incldocs;
-    rpmQueryFlags qva_flags;	/*!< from --nodigest/--nosignature */
+/*@owned@*/ /*@null@*/
+    rpmRelocation * relocations;
 /*@null@*/
     const char * prefix;
 /*@observer@*/ /*@null@*/
     const char * rootdir;
-    uint_32 rbtid;		/*!< from --rollback */
 };
 
 /** \ingroup rpmcli
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 91e638bb2..f9e3a1daf 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -357,10 +357,6 @@ rpmfi rpmfiInit(rpmfi fi, int fx)
 	    fi->i = fx - 1;
 	    fi->j = -1;
 	}
-#ifdef	DYING
-	else
-	    fi = NULL;
-#endif
     }
 
     /*@-refcounttrans@*/
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 2e04aa51b..a398e3459 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -444,7 +444,8 @@ rpmtsi XrpmtsiInit(rpmts ts, const char * fn, unsigned int ln)
     tsi = xcalloc(1, sizeof(*tsi));
     tsi->ts = rpmtsLink(ts, "rpmtsi");
     tsi->reverse = ((rpmtsFlags(ts) & RPMTRANS_FLAG_REVERSE) ? 1 : 0);
-    tsi->oc = (tsi->reverse ? (rpmtsNElements(ts) - 1) : 0);
+    tsi->ocmax = rpmtsNElements(ts);
+    tsi->oc = (tsi->reverse ? (tsi->ocmax - 1) : 0);
     tsi->ocsave = tsi->oc;
 /*@-modfilesys@*/
 if (_rpmte_debug)
@@ -465,13 +466,13 @@ rpmte rpmtsiNextElement(rpmtsi tsi)
     rpmte te = NULL;
     int oc = -1;
 
-    if (tsi == NULL || tsi->ts == NULL || rpmtsNElements(tsi->ts) <= 0)
+    if (tsi == NULL || tsi->ts == NULL || tsi->ocmax <= 0)
 	return te;
 
     if (tsi->reverse) {
-	if (tsi->oc >= 0)			oc = tsi->oc--;
+	if (tsi->oc >= 0)		oc = tsi->oc--;
     } else {
-    	if (tsi->oc < rpmtsNElements(tsi->ts))	oc = tsi->oc++;
+    	if (tsi->oc < tsi->ocmax)	oc = tsi->oc++;
     }
     tsi->ocsave = oc;
 /*@-branchstate@*/
diff --git a/lib/rpmte.h b/lib/rpmte.h
index 5fbd235df..0f512dd6c 100644
--- a/lib/rpmte.h
+++ b/lib/rpmte.h
@@ -128,6 +128,7 @@ struct rpmtsi_s {
     rpmts ts;		/*!< transaction set. */
     int reverse;	/*!< reversed traversal? */
     int ocsave;		/*!< last returned iterator index. */
+    int ocmax;		/*!< iterator max index. */
     int oc;		/*!< iterator index. */
 };
 
diff --git a/lib/transaction.c b/lib/transaction.c
index b9cf4bf8d..9efe99b49 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -7,6 +7,7 @@
 
 #include <rpmmacro.h>	/* XXX for rpmExpand */
 
+#include "fsm.h"
 #include "psm.h"
 
 #include "rpmdb.h"
@@ -111,9 +112,9 @@ static fileAction decideFileFate(const rpmts ts,
 	}
     }
 
-    diskWhat = whatis(sb.st_mode);
-    dbWhat = whatis(ofi->fmodes[ofi->i]);
-    newWhat = whatis(nfi->fmodes[nfi->i]);
+    diskWhat = whatis((int_16)sb.st_mode);
+    dbWhat = whatis(rpmfiFMode(ofi));
+    newWhat = whatis(rpmfiFMode(nfi));
 
     /*
      * RPM >= 2.3.10 shouldn't create config directories -- we'll ignore
@@ -136,36 +137,25 @@ static fileAction decideFileFate(const rpmts ts,
      * possible in case something else (like the timestamp) has changed.
      */
     if (dbWhat == REG) {
-#ifdef	DYING
-	if (ofi->md5s != NULL && nfi->md5s != NULL) {
-#endif
-	    const unsigned char * omd5 = ofi->md5s + (16 * ofi->i);
-	    const unsigned char * nmd5 = nfi->md5s + (16 * nfi->i);
-	    if (domd5(fn, buffer, 0, NULL))
-		return FA_CREATE;	/* assume file has been removed */
-	    if (!memcmp(omd5, buffer, 16))
-		return FA_CREATE;	/* unmodified config file, replace. */
-	    if (!memcmp(omd5, nmd5, 16))
-		return FA_SKIP;		/* identical file, don't bother. */
-#ifdef	DYING
-	} else {
-	    const char * omd5 = ofi->fmd5s[ofi->i];
-	    const char * nmd5 = nfi->fmd5s[nfi->i];
-	    if (domd5(fn, buffer, 1, NULL))
-		return FA_CREATE;	/* assume file has been removed */
-	    if (!strcmp(omd5, buffer))
-		return FA_CREATE;	/* unmodified config file, replace. */
-	    if (!strcmp(omd5, nmd5))
-		return FA_SKIP;		/* identical file, don't bother. */
-	}
-#endif
+	const unsigned char * omd5, * nmd5;
+	if (domd5(fn, buffer, 0, NULL))
+	    return FA_CREATE;	/* assume file has been removed */
+	omd5 = rpmfiMD5(ofi);
+	if (!memcmp(omd5, buffer, 16))
+	    return FA_CREATE;	/* unmodified config file, replace. */
+	nmd5 = rpmfiMD5(nfi);
+	if (!memcmp(omd5, nmd5, 16))
+	    return FA_SKIP;	/* identical file, don't bother. */
     } else /* dbWhat == LINK */ {
+	const char * oFLink, * nFLink;
 	memset(buffer, 0, sizeof(buffer));
 	if (readlink(fn, buffer, sizeof(buffer) - 1) == -1)
 	    return FA_CREATE;	/* assume file has been removed */
-	if (!strcmp(ofi->flinks[ofi->i], buffer))
+	oFLink = rpmfiFLink(ofi);
+	if (!strcmp(oFLink, buffer))
 	    return FA_CREATE;	/* unmodified config file, replace. */
-	if (!strcmp(ofi->flinks[ofi->i], nfi->flinks[nfi->i]))
+	nFLink = rpmfiFLink(nfi);
+	if (!strcmp(oFLink, nFLink))
 	    return FA_SKIP;	/* identical file, don't bother. */
      }
 
@@ -185,29 +175,19 @@ static fileAction decideFileFate(const rpmts ts,
 static int filecmp(rpmfi afi, rpmfi bfi)
 	/*@*/
 {
-    fileTypes awhat = whatis(afi->fmodes[afi->i]);
-    fileTypes bwhat = whatis(bfi->fmodes[bfi->i]);
+    fileTypes awhat = whatis(rpmfiFMode(afi));
+    fileTypes bwhat = whatis(rpmfiFMode(bfi));
 
     if (awhat != bwhat) return 1;
 
     if (awhat == LINK) {
-	const char * alink = afi->flinks[afi->i];
-	const char * blink = bfi->flinks[bfi->i];
+	const char * alink = rpmfiFLink(afi);
+	const char * blink = rpmfiFLink(bfi);
 	return strcmp(alink, blink);
     } else if (awhat == REG) {
-#ifdef	DYING
-	if (afi->md5s != NULL && bfi->md5s != NULL) {
-#endif
-	    const unsigned char * amd5 = afi->md5s + (16 * afi->i);
-	    const unsigned char * bmd5 = bfi->md5s + (16 * bfi->i);
-	    return memcmp(amd5, bmd5, 16);
-#ifdef	DYING
-	} else {
-	    const char * amd5 = afi->fmd5s[afi->i];
-	    const char * bmd5 = bfi->fmd5s[bfi->i];
-	    return strcmp(amd5, bmd5);
-	}
-#endif
+	const unsigned char * amd5 = rpmfiMD5(afi);
+	const unsigned char * bmd5 = rpmfiMD5(bfi);
+	return memcmp(amd5, bmd5, 16);
     }
 
     return 0;
@@ -253,6 +233,7 @@ static int handleInstInstalledFiles(const rpmts ts,
     ps = rpmtsProblems(ts);
     for (i = 0; i < sharedCount; i++, shared++) {
 	int otherFileNum, fileNum;
+	int isCfgFile;
 
 	otherFileNum = shared->otherFileNum;
 	(void) rpmfiSetFX(otherFi, otherFileNum);
@@ -260,6 +241,8 @@ static int handleInstInstalledFiles(const rpmts ts,
 	fileNum = shared->pkgFileNum;
 	(void) rpmfiSetFX(fi, fileNum);
 
+	isCfgFile = ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG);
+
 #ifdef	DYING
 	/* XXX another tedious segfault, assume file state normal. */
 	if (otherStates && otherStates[otherFileNum] != RPMFILE_STATE_NORMAL)
@@ -277,7 +260,7 @@ static int handleInstInstalledFiles(const rpmts ts,
 			altNEVR,
 			0);
 	    }
-	    if (!(rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG) {
+	    if (!isCfgFile) {
 		/*@-assignexpose@*/ /* FIX: p->replaced, not fi */
 		if (!shared->isRemoved)
 		    fi->replaced[numReplaced++] = *shared;
@@ -285,13 +268,12 @@ static int handleInstInstalledFiles(const rpmts ts,
 	    }
 	}
 
-	if ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG) {
+	if (isCfgFile) {
 	    fileAction action;
 	    action = decideFileFate(ts, otherFi, fi);
 	    fi->actions[fileNum] = action;
 	}
-	fi->replacedSizes[fileNum] = otherFi->fsizes[otherFi->i];
-
+	fi->replacedSizes[fileNum] = rpmfiFSize(otherFi);
     }
     ps = rpmpsFree(ps);
 
@@ -451,7 +433,7 @@ otherFps->baseName);
 if (otherFileNum == otherFc) {
 /*@-modfilesys@*/
 if (_fps_debug)
-fprintf(stderr, "*** NULL %s/%s%s\n",
+fprintf(stderr, "*** FP_EQUAL NULL %s/%s%s\n",
 ISROOT(fiFps->entry->dirName),
 (fiFps->subDir ? fiFps->subDir : ""),
 fiFps->baseName);
@@ -469,7 +451,8 @@ fiFps->baseName);
 /*@=boundswrite@*/
     if (bingoFps == NULL) {
 /*@-modfilesys@*/
-fprintf(stderr, "*** NULL %s/%s%s\n",
+if (_fps_debug)
+fprintf(stderr, "*** bingoFps NULL %s/%s%s\n",
 ISROOT(fiFps->entry->dirName),
 (fiFps->subDir ? fiFps->subDir : ""),
 fiFps->baseName);
@@ -481,6 +464,7 @@ fiFps->baseName);
     /*@-nullpass@*/	/* LCL: looks good to me */
     if (!(fiFps == bingoFps || FP_EQUAL((*fiFps), (*bingoFps)))) {
 /*@-modfilesys@*/
+if (_fps_debug)
 fprintf(stderr, "***  BAD %s/%s%s\n",
 ISROOT(bingoFps->entry->dirName),
 (bingoFps->subDir ? bingoFps->subDir : ""),
@@ -517,6 +501,8 @@ static void handleOverlappedFiles(const rpmts ts,
 	struct fingerPrint_s * fiFps;
 	int otherPkgNum, otherFileNum;
 	rpmfi otherFi;
+	int_32 FFlags;
+	int_16 FMode;
 	const rpmfi * recs;
 	int numRecs;
 
@@ -525,6 +511,8 @@ static void handleOverlappedFiles(const rpmts ts,
 
 	fn = rpmfiFN(fi);
 	fiFps = fi->fps + i;
+	FFlags = rpmfiFFlags(fi);
+	FMode = rpmfiFMode(fi);
 
 	fixupSize = 0;
 
@@ -594,10 +582,9 @@ static void handleOverlappedFiles(const rpmts ts,
 		/* XXX is this test still necessary? */
 		if (fi->actions[i] != FA_UNKNOWN)
 		    /*@switchbreak@*/ break;
-		if ((rpmfiFFlags(fi) & RPMFILE_CONFIG) && 
-			!lstat(fn, &sb)) {
+		if ((FFlags & RPMFILE_CONFIG) && !lstat(fn, &sb)) {
 		    /* Here is a non-overlapped pre-existing config file. */
-		    fi->actions[i] = (rpmfiFFlags(fi) & RPMFILE_NOREPLACE)
+		    fi->actions[i] = (FFlags & RPMFILE_NOREPLACE)
 			? FA_ALTNAME : FA_BACKUP;
 		} else {
 		    fi->actions[i] = FA_CREATE;
@@ -618,11 +605,11 @@ assert(otherFi != NULL);
 	    }
 
 	    /* Try to get the disk accounting correct even if a conflict. */
-	    fixupSize = otherFi->fsizes[otherFileNum];
+	    fixupSize = rpmfiFSize(otherFi);
 
-	    if ((rpmfiFFlags(fi) & RPMFILE_CONFIG) && !lstat(fn, &sb)) {
+	    if ((FFlags & RPMFILE_CONFIG) && !lstat(fn, &sb)) {
 		/* Here is an overlapped  pre-existing config file. */
-		fi->actions[i] = (rpmfiFFlags(fi) & RPMFILE_NOREPLACE)
+		fi->actions[i] = (FFlags & RPMFILE_NOREPLACE)
 			? FA_ALTNAME : FA_SKIP;
 	    } else {
 		fi->actions[i] = FA_CREATE;
@@ -643,16 +630,16 @@ assert(otherFi != NULL);
 	    }
 	    if (XFA_SKIPPING(fi->actions[i]))
 		/*@switchbreak@*/ break;
-	    if (fi->fstates && fi->fstates[i] != RPMFILE_STATE_NORMAL)
+	    if (rpmfiFState(fi) != RPMFILE_STATE_NORMAL)
 		/*@switchbreak@*/ break;
-	    if (!(S_ISREG(fi->fmodes[i]) && (rpmfiFFlags(fi) & RPMFILE_CONFIG))) {
+	    if (!(S_ISREG(FMode) && (FFlags & RPMFILE_CONFIG))) {
 		fi->actions[i] = FA_ERASE;
 		/*@switchbreak@*/ break;
 	    }
 		
 	    /* Here is a pre-existing modified config file that needs saving. */
 	    {	char md5sum[50];
-		const unsigned char * MD5 = fi->md5s + (16 * i);
+		const unsigned char * MD5 = rpmfiMD5(fi);
 		if (!domd5(fn, md5sum, 0, NULL) && memcmp(MD5, md5sum, 16)) {
 		    fi->actions[i] = FA_BACKUP;
 		    /*@switchbreak@*/ break;
@@ -664,8 +651,8 @@ assert(otherFi != NULL);
 /*@=boundswrite@*/
 
 	/* Update disk space info for a file. */
-	rpmtsUpdateDSI(ts, fi->fps[i].entry->dev,
-                fi->fsizes[i], fi->replacedSizes[i], fixupSize, fi->actions[i]);
+	rpmtsUpdateDSI(ts, fiFps->entry->dev,
+                rpmfiFSize(fi), fi->replacedSizes[i], fixupSize, fi->actions[i]);
 
     }
     ps = rpmpsFree(ps);
@@ -892,20 +879,25 @@ static void skipFiles(const rpmts ts, rpmfi fi)
 	fi = rpmfiInit(fi, 0);
 	if (fi != NULL)		/* XXX lclint */
 	while ((i = rpmfiNext(fi)) >= 0) {
-	    const char * dir;
+	    const char * fdn, * fbn;
+	    int_16 fFMode;
 
 	    if (XFA_SKIPPING(fi->actions[i]))
 		/*@innercontinue@*/ continue;
-	    if (whatis(fi->fmodes[i]) != XDIR)
+
+	    fFMode = rpmfiFMode(fi);
+
+	    if (whatis(fFMode) != XDIR)
 		/*@innercontinue@*/ continue;
-	    dir = fi->dnl[fi->dil[i]];
-	    if (strlen(dir) != dnlen)
+	    fdn = rpmfiDN(fi);
+	    if (strlen(fdn) != dnlen)
 		/*@innercontinue@*/ continue;
-	    if (strncmp(dir, dn, dnlen))
+	    if (strncmp(fdn, dn, dnlen))
 		/*@innercontinue@*/ continue;
-	    if (strlen(fi->bnl[i]) != bnlen)
+	    fbn = rpmfiBN(fi);
+	    if (strlen(fbn) != bnlen)
 		/*@innercontinue@*/ continue;
-	    if (strncmp(fi->bnl[i], bn, bnlen))
+	    if (strncmp(fbn, bn, bnlen))
 		/*@innercontinue@*/ continue;
 	    rpmMessage(RPMMESS_DEBUG, _("excluding directory %s\n"), dn);
 	    fi->actions[i] = FA_SKIPNSTATE;
@@ -1107,11 +1099,6 @@ rpmMessage(RPMMESS_DEBUG, _("computing %d file fingerprints\n"), totalFileCount)
 	    continue;	/* XXX can't happen */
 	fc = rpmfiFC(fi);
 
-#ifdef	DYING	/* XXX W2DO? this is now done in rpmtsiFi, okay ??? */
-	fi->magic = RPMFIMAGIC;
-	fi->te = p;
-#endif
-
 	/*@-branchstate@*/
 	switch (rpmteType(p)) {
 	case TR_ADDED:
diff --git a/po/cs.po b/po/cs.po
index 790d9d7ce..38a926890 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -74,255 +74,163 @@ 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:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "vypsat používanou verzi rpm"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "poskytnout výstu s méně detaily"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "poskytnout detailnější výstup"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "vypsat expanzi makra <výraz>+"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "odeslat stdout do <příkazu>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<přík>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "použít <adr> jako adresář nejvyšší úrovně"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<adresář>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "číst <soubor:...> místo implicitního makro souboru"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<soubor:...>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "číst <soubor:...> místo implicitního rpmrc souboru"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "zobrazit finální konfiguraci rpmrc a maker"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "zakázat použití libio(3) API"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "ladit protokol datového toku"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "ladit rpmio I/O"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "ladit manipulaci s URL cache"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr "Volby dotazů (s -q or --query):"
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr "Vollby kontroly (s -V or --verify):"
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr "Volby signatury:"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr "Volby databáze:"
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "Sestavovací volby s [ <spec_soubor> | <tar_soubor> | <zdrojový_balíček> ]:"
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr "Volby pro Instalaci/Aktualizaci/Mazání:"
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr "Společné volby pro všechny módy:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (c) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Tento program lze volně šířit podle podmínek GNU GPL."
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Použití: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr "Volba --rcfile byla odstraněna.\n"
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Použijte volbu \"--macros <soubor:...>\".\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Interní chyba při zpracování parametrů (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavní režim"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "najednou lze provést jen jeden typ dotazu či ověření"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "neočekávaný příznak pro dotaz"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "neočekávaný formát dotazu"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "neočekávaný zdroj dotazu"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath zadána pro operaci, která databázi nepoužívá"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 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"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "soubory mohou být přemístěny jen při instalaci balíčků"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "použít lze jen jeden z parametrů --prefix nebo --relocate"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 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ů"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 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ů"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry pro --prefix musejí začínat znakem /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 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ů"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "použít lze jen jeden z parametrů --excludedocs a --includedocs"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles může být použit jen při instalaci balíčků"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 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ů"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -330,7 +238,7 @@ msgstr ""
 "volba pro potlačení skriptů může být použita jen při instalaci nebo při "
 "odstraňování balíčků"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -338,7 +246,7 @@ msgstr ""
 "volba pro potlačení triggerů může být použita jen při instalaci nebo "
 "odstraňování balíčků"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -346,13 +254,13 @@ msgstr ""
 "--nodeps může být použit jen při sestavování, rekompilaci, instalaci, "
 "odstraňování a kontrole"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 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í"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -360,82 +268,82 @@ msgstr ""
 "--root (-r) může být použit jen při instalaci, odstraňování, dotazech nebo "
 "znovuvytvoření databáze"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry pro --root (-r) musejí začínat znakem /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "žádné soubory k podepsání\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "přístup k souboru %s se nezdařil\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp nenalezeno: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Vložte heslovou frázi: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Chybná heslová fráze\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Heslová fráze je v pořádku.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Špatná %%_signature spec v souboru maker.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign může být použit jen při sestavování balíčků"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "spuštění selhalo\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestavení nezadány žádné balíčky"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "pro sestavení nezadány žádné spec soubory"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány žádné tar soubory"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nezadány žádné balíčky pro instalaci"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "nezadány žádné balíčky pro instalaci"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "k dotazu nezadány žádné parametry"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezadány žádné balíčky"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "neočekávané parametry pro --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "k dotazu nezadány žádné parametry"
@@ -1227,7 +1135,7 @@ msgstr "Nenalezeny žádné kompatibilní architektury pro sestavení\n"
 msgid "Package has no %%description: %s\n"
 msgstr "Balíček nemá žádné %%description: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot byl již nastaven, ignoruji %s\n"
@@ -1661,17 +1569,107 @@ msgstr "%s: readLead selhalo\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "vypsat expanzi makra <výraz>+"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "číst <soubor:...> místo implicitního makro souboru"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "nekontrolovat závislosti balíčků"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "nekontrolovat architekturu balíčku"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "zakázat použití libio(3) API"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "ověřit podpis v balíčku"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "odeslat stdout do <příkazu>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "použít <adr> jako adresář nejvyšší úrovně"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "zobrazit finální konfiguraci rpmrc a maker"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "poskytnout výstu s méně detaily"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "poskytnout detailnější výstup"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "vypsat používanou verzi rpm"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "ladit protokol datového toku"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Interní chyba při zpracování parametrů (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "ladit rpmio I/O"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "ladit manipulaci s URL cache"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1692,21 +1690,21 @@ msgstr "přemístění musejí obsahovat ="
 msgid "relocations must have a / following the ="
 msgstr "přemístění musejí mít za znakem = znak /"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 #, fuzzy
 msgid "malformed rollback time/date stamp argument"
 msgstr "porušený rollback čas"
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "nainstalovat všechny soubory i konfigurace, které by se jinak mohly vynechat"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1714,151 +1712,140 @@ msgstr ""
 "odstranit všechny balíčky odpovídající <balíčku> (obvykle se generuje chyba, "
 "specifikuje-li <balíček> více balíčků)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr "nespouštět žádné skripty určené pro balíčky"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "přemístění souborů v nepřemístitelném balíčku"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr "uchovat smazané soubory přesunem do podadresáře"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "smazat (deinstalovat) balíček"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<balíček>"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "neinstalovat dokumentaci"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "přeskočit soubory s úvodní cestou <cesta> "
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr "<cesta>"
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "zkratka pro --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr "aktualizace balíčku jestliže je již nainstalován"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<soubor_balíčku>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "během instalace balíčku zobrazit dvojité křížky (dobré s -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "nekontrolovat architekturu balíčku"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "nekontrolovat operační systém balíčku"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "nekontrolovat volné místo na disku před instalací"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "nainstalovat dokumentaci"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "nainstalovat balíček"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "upravit databázi, ale neupravovat systém souborovů"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "nekontrolovat závislosti balíčků"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "nekontrolovat MD5 souborů v balíčku"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "pro vyřešení závislostí neměnit pořadí instalace balíčků"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nespouštět žádné skripty (jsou-li nějaké)"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "nekontrolovat závislosti balíčků"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "nekontrolovat architekturu balíčku"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "ověřit podpis v balíčku"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "nespouštět žádné skripty aktivované tímto balíčkem"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nespouštět žádné skripty určené pro balíčky"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nespouštět žádné instalační skripty"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1866,48 +1853,52 @@ msgstr ""
 "aktualizovat na starou verzi balíčku (--force to dělá při aktualizacích "
 "automaticky)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "během instalace balíčku zobrazit procenta"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "přemístit soubory do <adr>, jsou-li přemístitelné"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<adresář>"
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr "přemístit soubory ze <staré_cesty> do <nové_cesty>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<stará_cesta>=<nová_cesta>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr "uchovat smazané soubory pomocí přebalení"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "instalovat, i když balíček přepíše existující soubory"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "přeinstalovat, i když je již balíček přítomen"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 #, fuzzy
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "odinstalovat nové balíčky, reinstalovat staré balíčky zpět do data"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr "<datum>"
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "neinstalovat ale sdělit, zda-li by to fungovalo či nikoli"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "aktualizace balíčku"
 
@@ -1939,8 +1930,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "dotaz/ověření balíčků vlastnícího soubor"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "dotaz/ověření souboru s balíčkem (tj. binárního RPM souboru)"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "dotázat/ověřit všechny balíčky"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -1989,124 +1981,116 @@ msgstr "dotaz/ověření balíčků vyžadujících závislost"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "dotaz/ověření balíčků poskytujících závislost"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "vypsat všechny konfigurační soubory"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "vypsat všechny soubory s dokumentací"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "zobrazit základní informace o souborech"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "vypsat soubory v balíčku"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr "vynechat %%ghost soubory"
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr "vynechat %%license soubory"
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr "vynechat %%readme soubory"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "použij následující formát dotazů"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr "nahradit i18n sekce do spec souboru"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "zobrazit stav vypsaných souborů"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "zobrazit rozšířený výpis souborů"
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "nekontrolovat MD5 souborů v balíčku"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "nekontrolovat velikost souborů"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "nekontrolovat cesty symbolických linek"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "nekontrolovat vlastníka souborů"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "nekontrolovat skupinu souborů"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr "nekontrolovat čas změny souboru"
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "nekontrolovat mód souborů"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "nekontrolovat soubory v balíčku"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "nekontrolovat závislosti balíčků"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "nespouštět %verifyscript (pokud existuje)"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "nekontrolovat SHA1 digest v hlavičce"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "nekontrolovat MD5 souborů v balíčku"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "podepsat balíček (zahodit aktuální podpis)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ověřit podpis v balíčku"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podepsat balíček (zahodit aktuální podpis)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "generovat PGP/GPG podpis"
 
@@ -2450,37 +2434,37 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "balíček %s-%s-%s má nesplněné požadavky: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 #, fuzzy
 msgid "========== relocations\n"
 msgstr "========== ukládání tsort relací\n"
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vyřazen: %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s vytvořen jako %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
@@ -2946,13 +2930,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2965,7 +2949,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2978,7 +2962,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2986,21 +2970,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3584,64 +3568,54 @@ msgstr "nemohu zjistit stav %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ověřit podpis v balíčku"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "nekontrolovat závislosti balíčků"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "ověřit podpis v balíčku"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "chyba při vytváření dočasného souboru %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "Společné volby pro všechny módy:"
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: otevření selhalo: %s\n"
@@ -3651,6 +3625,44 @@ msgstr "%s: otevření selhalo: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
+#~ msgid "<cmd>"
+#~ msgstr "<přík>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "číst <soubor:...> místo implicitního makro souboru"
+
+#~ msgid "<file:...>"
+#~ msgstr "<soubor:...>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "číst <soubor:...> místo implicitního rpmrc souboru"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Použití: %s {--help}\n"
+
+#~ msgid "The --rcfile option has been eliminated.\n"
+#~ msgstr "Volba --rcfile byla odstraněna.\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Použijte volbu \"--macros <soubor:...>\".\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath zadána pro operaci, která databázi nepoužívá"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "dotaz/ověření souboru s balíčkem (tj. binárního RPM souboru)"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "zobrazit rozšířený výpis souborů"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "nekontrolovat závislosti balíčků"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "ověřit podpis v balíčku"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "definování makra <jméno> s obsahem <tělo>"
 
diff --git a/po/da.po b/po/da.po
index 088e4382b..b9cd7effc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -75,265 +75,173 @@ msgstr "fejl ved lćsning af hovedet pĺ pakke\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke genĺbne pakkeindhold: %s\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "vis versionen af rpm som benyttes"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "medtag mindre detaljerede oplysninger"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "medtag mere detaljerede oplysninger"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "udlćs makroudvidelse af <udtryk>+"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "send standard-ud til <kmd>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<kmd>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "brug <katalog> som topniveau-katalog"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<katalog>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "lćs <fil:...> i stedet for standard makrofil(er)"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<fil:...>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "lćs <fil:...> i stedet for standard rpmrc-fil(er)"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "vis den endelige rpmrc og makrokonfiguration"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "undlad at benytte libio(3)-API"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "aflus protokol-datastrřm"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "aflus rpmio I/O"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "aflus URL-bufferhĺndtering"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr "Forespřrgselstilvalg (med -q eller --query):"
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifikationstilvalg (med -V eller --verify):"
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr "Signaturtilvalg"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr "Databasetilvalg:"
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opbygningstilvalg med [ <spec-fil> | <tararkiv> | <kildepakke> ]:"
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr "Fćlles tilvalg for alle rpm-tilstande:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Dette program kan frit distribueres under betingelserne i GNU GPL"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Brug: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr "Tilvalget --rcfile er fjernet.\n"
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Brug \"--macros <fil:...>\" i stedet..\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "kun ét hovedtilvalg kan angives"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "kun én af forespřrgsel/verificér kan udfřres ad gangen"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "uventet forespřrgselsflag"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "uventet forespřrgselsformat"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "uventet forespřrgselskilde"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath angivet ved en operation, der ikke benytter en database"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installation, opgradering, rmsource og rmspec kan tvinges igennem"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omrokeres under installation"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "kun én af --prefix eller --relocate kan bruges"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate og --excludepath kan kun bruges, nĺr nye pakker installeres"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun bruges, nĺr nye pakker installeres"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametre til --prefix skal starte med et /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun angives ved installation"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun angives ved installation"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan kun angives ved installation"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan kun angives ved installation"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan kun angives ved installation"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan kun angives ved installation"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "kun én af --excludedocs og --includedocs kan angives"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan kun angives ved installation"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan kun angives ved installation"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan kun angives ved installation"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan kun angives ved installation"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan kun angives ved installation"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb kan kun angives ved installation og sletning"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--notriggers kan kun angives ved installation og sletning af pakker"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -341,13 +249,13 @@ msgstr ""
 "--nodeps kan kun angives ved opbygning, genopbygning, genoversćttelse, "
 "installation, sletning og verifikation"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan kun angives ved installation, sletning og opbygning"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -355,82 +263,82 @@ msgstr ""
 "--root (-r) kan kun angives ved installation, sletning, forespřrgsel og "
 "genopbygning af databasen"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parameteren til --root (-r) skal starte med et /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "ingen filer at underskrive\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke tilgĺ filen %s\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp ikke fundet: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Indtast adgangskode: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Adgangskode ikke godkendt\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Adgangskode godkendt.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Ugyldig angivelse af %%_signature i makrofil.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign kan kun bruges ved pakkeopbygning"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "eksekvering mislykkedes\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler angivet til genopbygning"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "ingen spec-fil angivet til opbygning"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "ingen tar-arkiver angivet til opbygning"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "ingen parametre angivet ved forespřrgsel"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "ingen parametre angivet ved verifikation"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "uventede parametre til --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved forespřrgsel"
@@ -1227,7 +1135,7 @@ msgstr "Ingen arkitekturer, der kan opbygges\n"
 msgid "Package has no %%description: %s\n"
 msgstr "Pakke har ingen %%description: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1660,17 +1568,107 @@ msgstr "%s: readLead mislykkedes\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "udlćs makroudvidelse af <udtryk>+"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "lćs <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "undlad at tjekke pakkers afhćngighedskrav"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "tjek ikke pakkens arkitektur"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "undlad at benytte libio(3)-API"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "verificér pakkesignatur"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "send standard-ud til <kmd>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "brug <katalog> som topniveau-katalog"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "vis den endelige rpmrc og makrokonfiguration"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "medtag mindre detaljerede oplysninger"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "medtag mere detaljerede oplysninger"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "vis versionen af rpm som benyttes"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "aflus protokol-datastrřm"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Intern fejl i parameterfortolkningen (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "aflus rpmio I/O"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "aflus URL-bufferhĺndtering"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1691,21 +1689,21 @@ msgstr "omrokeringer skal indeholde et ="
 msgid "relocations must have a / following the ="
 msgstr "i omrokeringer skal = efterfřlges af /"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installér alle filer -- ogsĺ konfigurationsfiler, der ellers skulle "
 "overspringes"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1713,156 +1711,146 @@ msgstr ""
 "fjern alle pakker, som passer med <pakke> (normalt ville det medfřre en "
 "fejl, hvis <pakke> angav flere pakker)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "udfřr ingen pakkespecifikke skripter"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "omdirigér filer i ikke-omdirigérbar pakke"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "slet (afinstallér) pakke"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "<pakke>"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "installér ikke dokumentation"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "overspring filer med foranstillet komponent <sti> "
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "forkortelse for --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "opgradér pakke, hvis den allerede er installeret"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<pakkefil>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "udlćs #'er efterhĺnden som pakken installeres (virker sammen med -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "tjek ikke pakkens arkitektur"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "tjek ikke pakkens operativsystem"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "tjek ikke om der er diskplads, fřr der installeres"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "installér dokumentation"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "installér pakke"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "opdatér databasen, men rřr ikke filsystemet"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "undlad at tjekke pakkers afhćngighedskrav"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "verificér ikke filerne i pakke"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "ćndr ikke pakkernes installationsrćkkefřlge for at opfylde afhćngigheder"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "udfřr ikke eventuelle skripter"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "undlad at tjekke pakkers afhćngighedskrav"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "tjek ikke pakkens arkitektur"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "verificér pakkesignatur"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "udfřr ikke smĺskripter, der mĺtte udlřses af denne pakke"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "udfřr ingen pakkespecifikke skripter"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "udfřr ingen installations-smĺskripter"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "udfřr ingen installations-smĺskripter"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "udfřr ingen installations-smĺskripter"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1870,49 +1858,53 @@ msgstr ""
 "opgradér til en ćldre version af pakken (--force gřr ikke dette automatisk "
 "ved opgraderinger)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "vis procenter efterhĺnden som pakken installeres"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "omdirigér pakken til <katalog>, hvis omdirigérbar"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<katalog>"
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "omdirigér filer fra <gammelsti> til <nysti>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "<gammelsti>=<nysti>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "intallér selvom pakken erstatter installerede filer"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "geninstallér hvis pakken allerede er installeret"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "installér ikke, men fortćl om det ville lykkes eller ej"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "opgradér pakke"
@@ -1945,8 +1937,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "forespřrg/verificér pakke(r), der ejer filen"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "forespřrg/verificér en pakkefil (dvs. en binćr *.rpm-fil)"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "forespřrg/verificér alle pakker"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -1995,131 +1988,122 @@ msgstr "forespřrg/verificér pakke(r), der stiller et krav"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "forespřrg/verificér pakke(r), der tilfredsstiller et krav"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "vis alle konfigurationsfiler"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "vis alle dokumentationsfiler"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "vis grundlćggende filinformation"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "vis liste over filerne i pakken"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "brug fřlgende forespřrgselsformat"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr "erstat i18n-sektioner i spec-fil"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "vis filernes status"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "giv en detaljeret filliste"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "verificér ikke filerne i pakke"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "undlad at tjekke pakkers afhćngighedskrav"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "udfřr ikke eventuelt %verifyscript"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "underskriv en pakke (slet nuvćrende signatur)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verificér pakkesignatur"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "underskriv en pakke (slet nuvćrende signatur)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "generér PGP/GPG-signatur"
@@ -2466,36 +2450,36 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr "========== gemmer omrokeringer\n"
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ekskluderer %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omrokerer %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ekskluderer %s %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "omrokerer %s til %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "omrokerer kataloget %s til %s\n"
@@ -2955,13 +2939,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
@@ -2974,7 +2958,7 @@ msgstr "ekskluderer kataloget %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2987,7 +2971,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2995,21 +2979,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3590,66 +3574,56 @@ msgstr "kunne ikke oprette %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verificér pakkesignatur"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "undlad at tjekke pakkers afhćngighedskrav"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "verificér pakkesignatur"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr ""
 "opretter kataloget %s\n"
 "\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "Fćlles tilvalg for alle rpm-tilstande:"
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ĺbning mislykkedes: %s\n"
@@ -3659,6 +3633,44 @@ msgstr "%s: ĺbning mislykkedes: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lćs manifest mislykkedes: %s\n"
 
+#~ msgid "<cmd>"
+#~ msgstr "<kmd>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "lćs <fil:...> i stedet for standard makrofil(er)"
+
+#~ msgid "<file:...>"
+#~ msgstr "<fil:...>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "lćs <fil:...> i stedet for standard rpmrc-fil(er)"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Brug: %s {--help}\n"
+
+#~ msgid "The --rcfile option has been eliminated.\n"
+#~ msgstr "Tilvalget --rcfile er fjernet.\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Brug \"--macros <fil:...>\" i stedet..\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath angivet ved en operation, der ikke benytter en database"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "forespřrg/verificér en pakkefil (dvs. en binćr *.rpm-fil)"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "giv en detaljeret filliste"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "undlad at tjekke pakkers afhćngighedskrav"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "verificér pakkesignatur"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "definér makro <navn> med vćrdi <vrdi>"
 
diff --git a/po/de.po b/po/de.po
index 2502ccdda..9c64e9376 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -116,265 +116,171 @@ msgstr "Fehler beim Suchen nach Paket %s\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "Die benutzte RPM-Version anzeigen"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "Die benutzte RPM-Version anzeigen"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "<VERZ> als Stammverzeichnis benutzen"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 # , c-format
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Version %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright Š 1998 - Red Hat Software"
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Dies darf unter den Bedingungen der ťGNU GPLŤ frei verteilt werden"
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Benutzung: rpm {--help}"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Benutzen Sie stattdessen -e oder --erase\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "Es darf nur ein Hauptmodus angegeben werden"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 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"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpmqv.c:738
-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:744
+#: rpmqv.c:428
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "Dateien können nur während der Paketinstallation verschoben werden"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente zu --prefix müssen mit einem / beginnen"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -383,7 +289,7 @@ msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -392,7 +298,7 @@ msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -401,7 +307,7 @@ msgstr ""
 "--nodeps darf nur während der Paketinstallation, -deinstallation und -"
 "überprüfung angegeben werden"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -409,7 +315,7 @@ msgstr ""
 "--test darf nur während der Paketinstallation, -deinstallation und -"
 "erstellung angegeben werden"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -417,84 +323,84 @@ msgstr ""
 "--root (-r) darf nur während der Paketinstallation, -deinstallation, -"
 "anfrage und Datenbankneuerstellungen angegeben werden"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign darf nur während der Paketerstellung benutzt werden"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "Unerwartete Argumente zu --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
@@ -1342,7 +1248,7 @@ msgid "Package has no %%description: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # , c-format
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
@@ -1799,16 +1705,105 @@ msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "Die benutzte RPM-Version anzeigen"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "Dateiabhängigkeiten nicht überprüfen"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "Paket-Architektur nicht überprüfen"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "Paketsignatur überprüfen"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "<VERZ> als Stammverzeichnis benutzen"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "Die benutzte RPM-Version anzeigen"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1830,21 +1825,21 @@ msgstr "Verschiebungen müssen ein ť=Ť beinhalten"
 msgid "relocations must have a / following the ="
 msgstr "bei Verschiebungen muss ein ť/Ť dem ť=Ť folgen"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "alle Dateien installieren, auch die config-Dateien, die sonst übergangen "
 "würden"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1852,158 +1847,148 @@ msgstr ""
 "Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird "
 "ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "Keine paketspezifischen Skripte ausführen"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "Paket löschen (deinstallieren)"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "Dokumentation nicht installieren"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "Abkürzung für --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "Paket-Betriebssystem nicht überprüfen"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "Dokumentation installieren"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "Paket installieren"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "Paket installieren"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "Dateiabhängigkeiten nicht überprüfen"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "Paket-Architektur nicht überprüfen"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "Paketsignatur überprüfen"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "Keine paketspezifischen Skripte ausführen"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2011,50 +1996,54 @@ msgstr ""
 "Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
 "Aktualisierungen automatisch)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "Prozentangabe bei der Paketinstallation ausgeben"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "Paket installieren"
@@ -2091,7 +2080,7 @@ msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr "Anfrage an alle Pakete"
 
 #: lib/poptQV.c:109
@@ -2147,139 +2136,129 @@ msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Dokumentation installieren"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 #, fuzzy
 msgid "dump basic file information"
 msgstr "Paketinformationen anzeigen"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 #, fuzzy
 msgid "list files in package"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 #, fuzzy
 msgid "use the following query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-#, fuzzy
-msgid "display a verbose file listing"
-msgstr "Dateiliste des Pakets anzeigen"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "Paket installieren"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "Paketsignatur überprüfen"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "PGP-Signatur generieren"
@@ -2633,39 +2612,39 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Hole %s heraus\n"
 
 # , c-format
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
@@ -3139,13 +3118,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
@@ -3158,7 +3137,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3171,7 +3150,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3179,21 +3158,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3794,63 +3773,53 @@ msgstr "anlegen von %s fehlgeschlagen\n"
 msgid "don't verify header+payload signature"
 msgstr "Paketsignatur überprüfen"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "Dateiabhängigkeiten nicht überprüfen"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "Paketsignatur überprüfen"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
@@ -3860,6 +3829,34 @@ msgstr "%s: Öffnen fehlgeschlagen\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
 
+#, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Benutzung: rpm {--help}"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Benutzen Sie stattdessen -e oder --erase\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr ""
+#~ "--dbpath wurde für eine Operation angeben, die keine Datenbank benutzt"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "Anfrage an alle Pakete"
+
+#, fuzzy
+#~ msgid "display a verbose file listing"
+#~ msgstr "Dateiliste des Pakets anzeigen"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "Dateiabhängigkeiten nicht überprüfen"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "Paketsignatur überprüfen"
+
 # oder besser: "... verletzen" ?
 #~ msgid "removing these packages would break dependencies:\n"
 #~ msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
diff --git a/po/en_RN.po b/po/en_RN.po
index 2e703444e..52cd36dab 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 2e703444e..52cd36dab 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 2e703444e..52cd36dab 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 207c80343..d32453683 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -73,258 +73,164 @@ msgstr "virhe etsittäessä pakettia %s\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "tulosta käytetyn rpm:n versio"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "tulosta käytetyn rpm:n versio"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "lähetä vakiotuloste <komento>:lle"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "käytä <hakem> ylimpänä hakemistona"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "käyttö: rpm {--help}"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Käytä sen sijaan -e tai --erase .\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "vain yksi päämoodi voidaan määritellä"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 #, fuzzy
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vain asennus tai päivitys voidaan pakottaa"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "vain toinen --prefix tai --relocate voidaan antaa"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pitää alkaa /-merkillä"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -332,7 +238,7 @@ msgid ""
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -340,7 +246,7 @@ msgid ""
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -349,7 +255,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -357,7 +263,7 @@ msgstr ""
 "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
 "käännettäessä"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -365,84 +271,84 @@ msgstr ""
 "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
 "kyseltäessä ja tietokannan uudelleenluonnissa"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkillä"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "uudelleenkäännolle ei määritelty paketteja"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "käännökselle ei annettu määrittelytiedostoja"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrejä"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags: odottamattomia parametrejä"
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "kyselylle ei annettu parametrejä"
@@ -1236,7 +1142,7 @@ msgstr "älä tarkista paketin arkkitehtuuria"
 msgid "Package has no %%description: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "En voi lukea %s: %s."
@@ -1685,16 +1591,105 @@ msgstr "%s: readLead  epäonnistui\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "tulosta käytetyn rpm:n versio"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "älä tarkista paketin riippuvuuksia"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "älä tarkista paketin arkkitehtuuria"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "tarkista paketin allekirjoitus"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "lähetä vakiotuloste <komento>:lle"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "käytä <hakem> ylimpänä hakemistona"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "tulosta käytetyn rpm:n versio"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1716,20 +1711,20 @@ msgstr "siirroissa pitää olla =-merkki"
 msgid "relocations must have a / following the ="
 msgstr "siirroissa pitää olla / =-merkin jälkeen"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1737,157 +1732,147 @@ msgstr ""
 "poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  "
 "<paketti> määrittää useita paketteja, tulee virhe)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "älä aja mitään pakettikohtaisia skriptejä"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "poista paketti"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "kysele kaikki paketit"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "älä asenna dokumentointia"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "lyhenne parametreille --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<vaihe> <määrittely> "
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "älä tarkista paketin käyttöjärjestelmää"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "asenna dokumentaatio"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "asenna paketti"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "asenna paketti"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "älä tarkista paketin riippuvuuksia"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "älä tarkista paketin arkkitehtuuria"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "tarkista paketin allekirjoitus"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "älä aja mitään pakettikohtaisia skriptejä"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "älä suorita asennusskriptejä"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "älä suorita asennusskriptejä"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "älä suorita asennusskriptejä"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1895,49 +1880,53 @@ msgstr ""
 "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
 "automaattisesti)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "tulosta asennuksen eteneminen prosentteina"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "asenna uudelleen, jos paketti on jo asennettu"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "älä asenna, mutta kerro onnistuisiko se"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "asenna paketti"
@@ -1974,7 +1963,7 @@ msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr "kysele kaikki paketit"
 
 #: lib/poptQV.c:109
@@ -2030,139 +2019,129 @@ msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 #, fuzzy
 msgid "list all configuration files"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 #, fuzzy
 msgid "list all documentation files"
 msgstr "asenna dokumentaatio"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 #, fuzzy
 msgid "dump basic file information"
 msgstr "näytä paketin tiedot"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 #, fuzzy
 msgid "list files in package"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 #, fuzzy
 msgid "use the following query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-#, fuzzy
-msgid "display a verbose file listing"
-msgstr "näytä paketin tiedostolistaus"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "asenna paketti"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "tarkista paketin allekirjoitus"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "generoi PGP-allekirjoitus"
@@ -2509,36 +2488,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Haen: %s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
@@ -3004,13 +2983,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
@@ -3023,7 +3002,7 @@ msgstr "virhe luotaessa hakemistoa %s: %s"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3036,7 +3015,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3044,21 +3023,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3649,63 +3628,53 @@ msgstr "%s:n luonti epäonnistui\n"
 msgid "don't verify header+payload signature"
 msgstr "tarkista paketin allekirjoitus"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "älä tarkista paketin riippuvuuksia"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "tarkista paketin allekirjoitus"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: avaus ei onnistunut\n"
@@ -3715,6 +3684,33 @@ msgstr "%s: avaus ei onnistunut\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
+#, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "käyttö: rpm {--help}"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Käytä sen sijaan -e tai --erase .\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "kysele kaikki paketit"
+
+#, fuzzy
+#~ msgid "display a verbose file listing"
+#~ msgstr "näytä paketin tiedostolistaus"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "älä tarkista paketin riippuvuuksia"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "tarkista paketin allekirjoitus"
+
 #~ msgid "removing these packages would break dependencies:\n"
 #~ msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
 
diff --git a/po/fr.po b/po/fr.po
index f425754fa..08dcb7aad 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -79,278 +79,182 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-#, fuzzy
-msgid "print the version of rpm being used"
-msgstr "   --version\t\t- affiche la version de rpm utilise"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "   --version\t\t- affiche la version de rpm utilise"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-#, fuzzy
-msgid "use <dir> as the top level directory"
-msgstr "      --root <dir>\t- utilise <dir> comme rpertoire racine"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Peut tre redistribu librement selon les termes de la GNU GPL"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Utilisez de prfrence -e ou --erase.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut tre spcifi"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "un seul type de requte/vrification peut tre effectu  la fois"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "source de requte inattendue"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 #, fuzzy
 msgid "unexpected query format"
 msgstr "source de requte inattendue"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "source de requte inattendue"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "seules l'installation et la mise  jour peuvent tre forces"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr ""
 "--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "un seul mode majeur peut tre spcifi"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--clean ne peut tre spcifi que lors de la construction d'un package"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 #, fuzzy
 msgid "--prefix may only be used when installing new packages"
 msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 #, fuzzy
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 #, fuzzy
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 #, fuzzy
 msgid "--includedocs may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 #, fuzzy
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "un seul mode majeur peut tre spcifi"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 #, fuzzy
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 #, fuzzy
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--percent ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 #, fuzzy
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--replacepkgs ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut tre spcifi que lors de l'installation d'un package"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -359,7 +263,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -368,7 +272,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -377,7 +281,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 #, fuzzy
 msgid ""
 "--test may only be specified during package installation, erasure, and "
@@ -386,7 +290,7 @@ msgstr ""
 "--test ne peut tre spcifi que lors de l'installation ou dsinstallation d'un "
 "package"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 #, fuzzy
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
@@ -395,85 +299,85 @@ msgstr ""
 "--root (-r) ne peut tre spcifi que lors de l'installation, de la "
 "dsinstallation ou de l'interrogation d'un package"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 #, fuzzy
 msgid "pgp not found: "
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "La vrification du mot de passe a chou\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Mot de passe correct.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 #, fuzzy
 msgid "exec failed\n"
 msgstr "La construction a chou.\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "aucun package n'a t spcifi pour la reconstruction"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 #, fuzzy
 msgid "no tar files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "aucun argument n'a t fourni pour la requte"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "aucun argument n'a t fourni pour la vrification"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "aucun argument n'a t fourni pour la requte"
@@ -1262,7 +1166,7 @@ msgstr "%s ne peut tre construit sur cette architecture\n"
 msgid "Package has no %%description: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -1709,16 +1613,106 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "   --version\t\t- affiche la version de rpm utilise"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr ""
+"        -f <file>+        - interroge le package  qui appartient <file>"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr ""
+"        -f <file>+        - interroge le package  qui appartient <file>"
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "      --root <dir>\t- utilise <dir> comme rpertoire racine"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+#, fuzzy
+msgid "print the version of rpm being used"
+msgstr "   --version\t\t- affiche la version de rpm utilise"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1741,181 +1735,169 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 #, fuzzy
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 #, fuzzy
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "      --hash            - affiche des '#' pendant l'installation du package "
 "(utile avec -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non install) <packagefile>"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr ""
-"        -f <file>+        - interroge le package  qui appartient <file>"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr ""
-"        -f <file>+        - interroge le package  qui appartient <file>"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 #, fuzzy
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
@@ -1924,56 +1906,60 @@ msgstr ""
 "      --oldpackage      - mise  jour par une ancienne version du package (--"
 "force"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 #, fuzzy
 msgid "print percentages as package installs"
 msgstr ""
 "      --percent         - affiche des '%' pendant l'installation du package"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 #, fuzzy
 msgid "install even if the package replaces installed files"
 msgstr ""
 "      --replacefiles    - installe mme si le package remplace des fichiers "
 "dj prsents"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 #, fuzzy
 msgid "reinstall if the package is already present"
 msgstr "      --replacepkgs      - rinstalle si le package est dj prsent"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 #, fuzzy
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 "      --test            - n'installe pas, mais indique si ca fonctionnerait "
 "ou pas"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr ""
@@ -2014,7 +2000,7 @@ msgstr ""
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
@@ -2073,139 +2059,130 @@ msgstr "aucun package n'a t spcifi pour la dsinstallation"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 #, fuzzy
 msgid "list all configuration files"
 msgstr ""
 "        -c                - donne uniquement la liste des fichiers de "
 "configuration (implique -l)"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 #, fuzzy
 msgid "list all documentation files"
 msgstr ""
 "        -d                - donne uniquement la liste des fichiers de "
 "documentation (implique -l)"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 #, fuzzy
 msgid "dump basic file information"
 msgstr ""
 "        -i                - affiche les informations relatives  un package"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 #, fuzzy
 msgid "list files in package"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 #, fuzzy
 msgid "use the following query format"
 msgstr "source de requte inattendue"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-#, fuzzy
-msgid "display a verbose file listing"
-msgstr "        -l                - affiche la liste des packages"
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "      --sign            - genre une signature PGP"
@@ -2552,36 +2529,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3042,13 +3019,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -3061,7 +3038,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3074,7 +3051,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3082,21 +3059,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3676,65 +3653,53 @@ msgid "don't verify header+payload signature"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr ""
-"        -f <file>+        - interroge le package  qui appartient <file>"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr ""
-"        -f <file>+        - interroge le package  qui appartient <file>"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3745,6 +3710,29 @@ msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Utilisez de prfrence -e ou --erase.\n"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr ""
+#~ "        -f <file>+        - interroge le package  qui appartient <file>"
+
+#, fuzzy
+#~ msgid "display a verbose file listing"
+#~ msgstr "        -l                - affiche la liste des packages"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr ""
+#~ "        -f <file>+        - interroge le package  qui appartient <file>"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr ""
+#~ "        -f <file>+        - interroge le package  qui appartient <file>"
+
+#, fuzzy
 #~ msgid "package %s has unsatisfied Requires: %s\n"
 #~ msgstr "aucun package n'a t spcifi pour l'installation"
 
diff --git a/po/gl.po b/po/gl.po
index 1e7d7e643..f734cb32d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -73,353 +73,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1201,7 +1109,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1619,16 +1527,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1649,211 +1640,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1882,7 +1869,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1929,118 +1916,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2377,36 +2356,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2857,13 +2836,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2876,7 +2855,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2889,7 +2868,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2897,21 +2876,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3485,60 +3464,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 2e703444e..52cd36dab 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 2e703444e..52cd36dab 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 56273d557..5cf76b8af 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -74,355 +74,263 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "prenta útgáfunúmer rpm sem veriđ er ađ nota"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "prenta útvíkkun fjölva <expr>+"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "senda frálag í <skipun>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "sýna endanlega rpmrc og stillingar fjölva"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM útgáfa %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc"
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Ţessu má dreifa frjálst samkvćmt skilmálum GNU GPL"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr ""
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1208,7 +1116,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot ţegar skilgreind, hunsa %s\n"
@@ -1629,16 +1537,104 @@ msgstr "%s: Fseek brást: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "prenta útvíkkun fjölva <expr>+"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "ekki skođa pakkaskilyrđin"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ekki skođa pakkaskilyrđin"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "ekki skođa pakkaskilyrđin"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "senda frálag í <skipun>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "sýna endanlega rpmrc og stillingar fjölva"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "prenta útgáfunúmer rpm sem veriđ er ađ nota"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1659,215 +1655,208 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<pakkaskrá>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<pakkaskrá>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "setja inn pakka"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "ekki yfirfara MD5 undirritun skráa"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "ekki skođa pakkaskilyrđin"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "ekki skođa pakkaskilyrđin"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "ekki skođa pakkaskilyrđin"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<gömul>=<ný>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "uppfćra pakka"
 
@@ -1898,8 +1887,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr ""
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "fyrirspurn/yfirferđ á pakkann sam á skrá"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -1948,121 +1938,113 @@ msgstr "fyrirspurn/yfirferđ á pakkana sem hafa pakkaţarfir"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "fyrirspurn/yfirferđ á pakkana sem uppfylla ţarfir annara pakka"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "ekki yfirfara MD5 undirritun skráa"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "ekki yfirfara stćrđ skráa"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "ekki yfirfara symlink slóđ skráa"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "ekki yfirfara eiganda skráa"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "ekki yfirfara hop skráa"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "ekki yfirfara heimildir skráa"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "ekki yfirfara skrárnar í pakkanum"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "ekki skođa pakkaskilyrđin"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ekki yfirfara SHA1 undirritunina"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ekki yfirfara MD5 undirritun skráa"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "búa til undirskrift"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "búa til undirskrift"
 
@@ -2400,36 +2382,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "get ekki opnađ pakka gagnagrunn í\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d fćra %s -> %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d fćra %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "lína %d: %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "%5d fćra %s -> %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%5d fćra %s -> %s\n"
@@ -2882,13 +2864,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2901,7 +2883,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2914,7 +2896,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2922,21 +2904,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3511,62 +3493,52 @@ msgstr "gat ekki búiđ til %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ekki skođa pakkaskilyrđin"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "ekki skođa pakkaskilyrđin"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "ekki skođa pakkaskilyrđin"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Fseek brást: %s\n"
@@ -3576,6 +3548,14 @@ msgstr "%s: Fseek brást: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s rmdir %s brást: %s\n"
 
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "ekki skođa pakkaskilyrđin"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "ekki skođa pakkaskilyrđin"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "skilgreina fjölva <nafn> međ gildinu <gildi>"
 
diff --git a/po/it.po b/po/it.po
index 2e703444e..52cd36dab 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 44360cea6..7963692c9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -81,197 +81,103 @@ msgstr "ĽŃĽĂĽąĄźĽ¸¤Ť¤éĽŘĽĂĽŔ¤ÎĆɤߚţ¤ß¤ÎĽ¨ĽéĄź\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "ɸ˝ŕ˝ĐÎϤň <cmd> ¤ŘĽŃĽ¤Ľ×¤ˇ¤Ţ¤š"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 #, fuzzy
 msgid "Signature options:"
 msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ĽĐĄźĽ¸ĽçĽó %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 "Ăřşî¸˘ (C) 1998 - Red Hat Software\n"
 "ËÝĚőźÔ żŔĹÄ ˝ź <kanda@nn.iij4u.or.jp>\n"
 "¸íĚőĹů¤ĎżŔĹĤޤÇ"
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "GNU°ěČ̸řÍ­ťČÍŃľöÂú˝ń¤Î˛ź¤ÇźŤÍł¤ËÇŰÉۤǤ­¤Ţ¤š"
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "ťČÍŃËĄ: rpm {--help}"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "-e ¤Ť --erase ¤ňťČ¤Ă¤Ć¤Ż¤Ŕ¤ľ¤¤\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, fuzzy, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "°úżô˝čÍý(%d)¤Ç¤ÎĆâÉôĽ¨ĽéĄź :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "°ě¤Ä¤ÎĽáĽ¸ĽăĄźĽâĄźĽÉ¤Î¤ß¤ňťŘÄꤡ¤Ć¤Ż¤Ŕ¤ľ¤¤"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "Ě䤤šç¤ď¤ť/¸ĄžÚ¤Ď°ěĹ٤˰ě¤Ä¤ˇ¤ŤźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽéĽ°"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽŐĽŠĄźĽŢĽĂĽČ"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "Í˝´ü¤ť¤ĚĚ䤤šç¤ď¤ť¤ÎĽ˝ĄźĽš"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "ĽÇĄźĽżĽŮĄźĽš¤ňťČÍѤˇ¤Ę¤¤¤Î¤Ë --dbpath ¤ŹÍż¤¨¤é¤ě¤Ć¤¤¤Ţ¤š"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "Ľ¤ĽóĽšĽČĄźĽëĄ˘Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉĄ˘Ľ˝ĄźĽšşď˝üĄ˘ĽšĽÚĽĂĽŻĽŐĽĄĽ¤Ľëşď˝üťţ¤Î¤ßśŻŔŠ¤Ç¤­"
 "¤Ţ¤š"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "ĽŐĽĄĽ¤Ľë¤ĎĽŃĽĂĽąĄźĽ¸Ľ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßşĆÇŰĂ֤Ǥ­¤Ţ¤š"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ¤â¤ˇ¤Ż¤Ď --relocate ¤Î¤¤¤ş¤ě¤Ť¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
@@ -279,82 +185,82 @@ msgstr ""
 "--relocate ¤Č --excludepath ¤Ďżˇ¤ˇ¤¤ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍŃ"
 "¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix ¤ĎżˇľŹ¤ËĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤š¤ë¤Č¤­¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ¤Ř¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ¤Č --includedocs ¤Ď¤É¤Á¤é¤Ť°ěĘý¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "-ignoreos ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "-ignoresize ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ¤ĎĽŃĽĂĽąĄźĽ¸¤Îşď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -362,13 +268,13 @@ msgid ""
 msgstr ""
 "--nodeps ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎşîŔŽĄ˘Ľ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘¸ĄžÚťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test ¤ĎĽŃĽĂĽąĄźĽ¸¤ÎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘şîŔŽťţ¤Î¤ßťŘÄę¤Ç¤­¤Ţ¤š"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -376,83 +282,83 @@ msgstr ""
 "--root (-r) ¤ĎĽ¤ĽóĽšĽČĄźĽëĄ˘şď˝üĄ˘Ě䤤šç¤ď¤ťĄ˘ĽÇĄźĽżĽŮĄźĽšşĆš˝ĂŰťţ¤Î¤ßťŘÄę¤Ç"
 "¤­¤Ţ¤š"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ¤Î°úżô¤Ď / ¤Ť¤éťĎ¤Ţ¤é¤Í¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "˝đĚž¤š¤ë¤ż¤á¤ÎĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ËĽ˘ĽŻĽťĽš¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 #, fuzzy
 msgid "pgp not found: "
 msgstr "pgp ¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "ĽŃĽšĽŐĽěĄźĽş¤ňĆţÎϤˇ¤Ć¤Ż¤Ŕ¤ľ¤¤: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "ĽŃĽšĽŐĽěĄźĽşĽÁĽ§ĽĂĽŻ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "ĽŃĽšĽŐĽěĄźĽş¤ĎŔľžď¤Ç¤šĄĽ\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤ĽëĂć¤ÎĚľ¸ú¤Ę %%_signature ĄŁ\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign ¤ĎĽŃĽĂĽąĄźĽ¸şîŔŽťţ¤Î¤ßťČÍѤǤ­¤Ţ¤š"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "źÂšÔźşÇÔ\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "şĆşîŔŽ¤š¤ë¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "şîŔŽ¤Î¤ż¤á¤Î spec ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "şîŔŽ(build)¤Î¤ż¤á¤Î tar ĽŐĽĄĽ¤Ľë¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤Î¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "¸ĄžÚ¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ¤Î°úżô¤Ź´Ö°ă¤Ă¤Ć¤¤¤Ţ¤š"
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "Ě䤤šç¤ď¤ť¤Î¤ż¤á¤Î°úżô¤Ź¤˘¤ę¤Ţ¤ť¤ó"
@@ -1257,7 +1163,7 @@ msgstr "şîŔŽ(build)˛ÄÇ˝¤ĘĽ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Ď¤˘¤ę¤Ţ¤ť¤ó"
 msgid "Package has no %%description: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤Ď %%description ¤Ź¤˘¤ę¤Ţ¤ť¤ó: %s"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "ĽÓĽëĽÉĽëĄźĽČ¤Ď¤š¤Ç¤ËťŘÄꤾ¤ě¤Ć¤¤¤Ţ¤š"
@@ -1710,16 +1616,106 @@ msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎÂОݼ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "ɸ˝ŕ˝ĐÎϤň <cmd> ¤ŘĽŃĽ¤Ľ×¤ˇ¤Ţ¤š"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "ĽČĽĂĽ×ĽÇĽŁĽěĽŻĽČĽę¤Č¤ˇ¤Ć <dir> ¤ňťČÍѤˇ¤Ţ¤š"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "ťČÍѤˇ¤Ć¤¤¤ë rpm ¤ÎĽĐĄźĽ¸ĽçĽó¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "°úżô˝čÍý(%d)¤Ç¤ÎĆâÉôĽ¨ĽéĄź :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1741,19 +1737,19 @@ msgstr "şĆÇŰĂÖ¤Ď = ¤ň´Ţ¤ó¤Ç¤¤¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 msgid "relocations must have a / following the ="
 msgstr "şĆÇŰĂÖ¤Ď = ¤ÎźĄ¤Ë / ¤Ç¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "ŔßÄę¤ňĽšĽ­ĽĂĽ×¤ˇĄ˘Á´ĽŐĽĄĽ¤Ľë¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1761,164 +1757,154 @@ msgstr ""
 "<package> ¤Č°ěĂפš¤ëĽŃĽĂĽąĄźĽ¸Á´¤Ć¤ňşď˝ü¤ˇ¤Ţ¤š(°ěČĚ\n"
 "\t\t\t      ĹŞ¤ËĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤚ¤ë¤ČĽ¨ĽéĄź¤Ë¤Ę¤ę¤Ţ¤š)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸ťŘÄę¤ÎĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "ĽŃĽš %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó(ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤ËÂФˇ¤Ć)"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ňşď˝ü(Ľ˘ĽóĽ¤ĽóĽšĽČĄźĽë)¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "ĽŃĽš <path> Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs ¤Č --replacefiles ¤ňĂť˝Ě¤ˇ¤ż¤â¤Î"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s-%s-%s ¤Ď¤š¤Ç¤ËĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤š"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '#' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š(-v ¤ňťČÍѤš¤ë¤ČÎɤ¤)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎÂОݼ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "ĽŃĽĂĽąĄźĽ¸ÂĐžÝOS¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëÁ°¤ËĽÇĽŁĽšĽŻ¤ÎÍĆÎĚĽÁĽ§ĽĂĽŻ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "ĽÉĽ­ĽĺĽáĽóĽČ¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 "ĽÇĄźĽżĽŮĄźĽš¤ňššżˇ¤ˇ¤Ţ¤š¤ŹĄ˘\n"
 "ĽŐĽĄĽ¤ĽëĽˇĽšĽĆĽŕ¤ÎĘŃšš¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "°Í¸Ŕ­¤ňËţ¤ż¤š¤ż¤á¤ÎĽŃĽĂĽąĄźĽ¸¤Î\n"
 "Ľ¤ĽóĽšĽČĄźĽë¤ňÍ׾ᤡ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "ĽŃĽĂĽąĄźĽ¸¤ÎÂОݼ˘ĄźĽ­ĽĆĽŻĽÁĽă¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 "¤ł¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤č¤Ă¤ĆĽČĽęĽŹĄź¤ľ¤ě¤ëĽšĽŻĽęĽ×ĽČ¤ň\n"
 "źÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸ťŘÄę¤ÎĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "Ľ¤ĽóĽšĽČĄźĽëĽšĽŻĽęĽ×ĽČ¤ňźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1926,53 +1912,57 @@ msgstr ""
 "¸Ĺ¤¤ĽĐĄźĽ¸ĽçĽó¤ÎĽŃĽĂĽąĄźĽ¸¤ËĽ˘ĽĂĽ×Ľ°ĽěĄźĽÉ¤ˇ¤Ţ¤š\n"
 "(Ľ˘ĽĂĽ×Ľ°ĽěĄźĽÉťţ¤Î --force ¤Ď¤ł¤ě¤ňźŤĆ°Ĺޤ˚Ԥ¤¤Ţ¤š)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëşÝ¤Ë '%' ¤ÇÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "şĆÇŰĂÖ˛ÄÇ˝¤ĘĽŃĽĂĽąĄźĽ¸¤ËÂФˇĄ˘Ľ¤ĽóĽšĽČĄźĽëĽŃĽš\n"
 "ŔÜĆŹź­¤ň <dir> ¤ËŔßÄꤡ¤Ţ¤š"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "<oldpath> ¤Ť¤é <newpath> ¤ËĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ľ¤ť¤Ţ¤š"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "<oldpath> ¤Ť¤é <newpath> ¤ËĽŐĽĄĽ¤Ľë¤ňşĆÇŰĂÖ¤ľ¤ť¤Ţ¤š"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 "Ľ¤ĽóĽšĽČĄźĽëťţ¤ËĂÖ¤­´š¤¨¤é¤ě¤ëĽŐĽĄĽ¤Ľë¤Ź\n"
 "¤˘¤Ă¤Ć¤âĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "´ű¤Ë¸şß¤š¤ëĽŃĽĂĽąĄźĽ¸¤Ç¤âşĆĽ¤ĽóĽšĽČĄźĽë¤ˇ¤Ţ¤š"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤ť¤ş¤ËĄ˘ĽĆĽšĽČ¤Î¤ßšÔ¤¤¤Ţ¤š"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
@@ -2009,8 +1999,8 @@ msgstr "ĽŐĽĄĽ¤Ľë¤ň˝ęÍ­¤ˇ¤Ć¤¤¤ëĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤Ţ¤š"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
+msgid "query/verify a package file"
+msgstr "Á´¤Ć¤ÎĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -2067,138 +2057,128 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "<cap> ¤ňÄ󜥤š¤ëĽŃĽĂĽąĄźĽ¸¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Á´¤Ć¤ÎŔßÄęĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Á´¤Ć¤ÎĽÉĽ­ĽĺĽáĽóĽČĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 #, fuzzy
 msgid "dump basic file information"
 msgstr "´đËÜĹŞ¤ĘĽŐĽĄĽ¤ĽëžđĘó¤ňĽŔĽóĽ×¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 #, fuzzy
 msgid "list files in package"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤ňÎóľó¤ˇ¤Ţ¤š\n"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "°Ę˛ź¤ÎĚ䤤šç¤ď¤ťĽŐĽŠĄźĽŢĽĂĽČ¤ňťČÍѤˇ¤Ţ¤š"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "°Ę˛ź¤ÎĽŤĽżĽíĽ°¤Ť¤é i18n ĽťĽŻĽˇĽçĽó¤ňĂÖ¤­´š¤¨¤Ţ¤š"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "Îóľó¤ˇ¤żĽŐĽĄĽ¤Ľë¤ÎžőÂÖ¤ňÉ˝ź¨¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:219
-#, fuzzy
-msgid "display a verbose file listing"
-msgstr "ĽŐĽĄĽ¤ĽëĽęĽšĽČ¤ňžéÄš¤ËÉ˝ź¨¤ˇ¤Ţ¤š"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "¤É¤ÎĂĘłŹ¤âźÂšÔ¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ĽŃĽĂĽąĄźĽ¸Ăć¤ÎĽŐĽĄĽ¤Ľë¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ˇ¤Ţ¤š(¸˝şß¤Î˝đĚž¤ĎźÎ¤Ć¤é¤ě¤Ţ¤š)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë˝đĚž¤ˇ¤Ţ¤š(¸˝şß¤Î˝đĚž¤ĎźÎ¤Ć¤é¤ě¤Ţ¤š)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "PGP/GPG ˝đĚž¤ňŔ¸ŔŽ¤ˇ¤Ţ¤š"
@@ -2549,36 +2529,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤Ď require ¤ŹËţ¤ż¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS ¤Ď˝üł°¤ľ¤ě¤Ć¤¤¤Ţ¤š: %s"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë¤Î˝üł°: %s%s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤ň %s ¤ËşĆÇŰĂÖ¤ˇ¤Ć¤¤¤Ţ¤š\n"
@@ -3052,13 +3032,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "˝đĚžĽŃĽĂĽÉ: %d\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ď missingok ĽŐĽéĽ°¤Î¤ż¤áĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
@@ -3071,7 +3051,7 @@ msgstr "ĽÇĽŁĽěĽŻĽČĽę¤Î˝üł°: %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3084,7 +3064,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3092,14 +3072,14 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 #, fuzzy
 msgid "repackage about-to-be-erased packages\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤Ď°ě¤Ä¤ÎĽĐĄźĽ¸ĽçĽó¤ÎĽŃĽĂĽąĄźĽ¸!\n"
@@ -3107,7 +3087,7 @@ msgstr "ĽŃĽĂĽąĄźĽ¸¤Ë¤Ď°ě¤Ä¤ÎĽĐĄźĽ¸ĽçĽó¤ÎĽŃĽĂĽąĄźĽ¸!\n"
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3700,63 +3680,53 @@ msgstr "%s ¤ÎşîŔŽ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
 msgid "don't verify header+payload signature"
 msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: fdOpen ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
@@ -3766,6 +3736,33 @@ msgstr "%s: fdOpen ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
 
+#, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "ťČÍŃËĄ: rpm {--help}"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "-e ¤Ť --erase ¤ňťČ¤Ă¤Ć¤Ż¤Ŕ¤ľ¤¤\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "ĽÇĄźĽżĽŮĄźĽš¤ňťČÍѤˇ¤Ę¤¤¤Î¤Ë --dbpath ¤ŹÍż¤¨¤é¤ě¤Ć¤¤¤Ţ¤š"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "ĽŃĽĂĽąĄźĽ¸ĽŐĽĄĽ¤Ľë¤Ë¤Ä¤¤¤ĆĚ䤤šç¤ď¤ť¤Ţ¤š"
+
+#, fuzzy
+#~ msgid "display a verbose file listing"
+#~ msgstr "ĽŐĽĄĽ¤ĽëĽęĽšĽČ¤ňžéÄš¤ËÉ˝ź¨¤ˇ¤Ţ¤š"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "ĽŃĽĂĽąĄźĽ¸¤Î°Í¸´Řˇ¸¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤ť¤ó"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "˝đĚž¤Î¸ĄžÚ¤ň¤ˇ¤Ţ¤š"
+
 #~ msgid "removing these packages would break dependencies:\n"
 #~ msgstr "¤ł¤ě¤é¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤Č°Í¸Ŕ­¤ňÇ˲ő¤ˇ¤Ţ¤š:\n"
 
diff --git a/po/ko.po b/po/ko.po
index d94b9f60a..bfbdb434d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -74,266 +74,174 @@ msgstr "ĆĐĹ°ÁöŔÇ Çě´ő¸Ś ŔĐ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "payload¸Ś ´Ů˝Ă ż­ źö žřŔ˝: %s\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "ÇöŔç ťçżëľÇ°í ŔÖ´Â rpm šöŔüŔť ÇĽ˝ĂÇŐ´Ď´Ů"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "ŔÚźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "žĆÁÖ ťóźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "<ÇĽÇö˝Ä>+ ŔÇ ¸ĹĹŠˇÎ ČŽŔĺŔť ĂâˇÂÇŐ´Ď´Ů"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "ÇĽÁŘĂâˇÂŔť <¸íˇÉ>Ŕ¸ˇÎ ş¸łŔ´Ď´Ů"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<¸íˇÉ>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "<ľđˇşĹ与>¸Ś ĂÖťóŔ§ ľđˇşĹ与ˇÎ ťçżëÇŐ´Ď´Ů"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<ľđˇşĹ与>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "ąâşť ¸ĹĹŠˇÎ ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<ĆÄŔĎ:..>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "ąâşť rpmrc ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "ÇöŔç źłÁ¤ľÇžî ŔÖ´Â rpmrcŔÇ łťżë°ú ¸ĹĹŠˇÎ¸Ś ş¸żŠÁÝ´Ď´Ů"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "libio(3) APIŔÇ ťçżëŔť ÇŘÁŚÇŐ´Ď´Ů"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "ľĽŔĚĹÍ ˝şĆŽ¸˛ ÇÁˇÎĹäÄÝŔť ľđšöą× ÇŐ´Ď´Ů"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "rpmio ŔÔ/ĂâˇÂŔť ľđšöą× ÇŐ´Ď´Ů"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "URL Äł˝Ă Çھ鸾Ŕť ľđšöą× ÇŐ´Ď´Ů"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr "ÁúŔÇ żÉźÇ (-q śÇ´Â --query żÉźÇ°ú ÇÔ˛˛ ťçżë):"
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr "°ËÁő żÉźÇ (-V śÇ´Â --verify żÉźÇ°ú ÇÔ˛˛ ťçżë):"
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr "ź­¸í żÉźÇ:"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr "ľĽŔĚĹÍşŁŔĚ˝ş żÉźÇ:"
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "´ŮŔ˝°ú ÇÔ˛˛ ťçżëÇĎ´Â ÁŚŔŰ żÉźÇ [ <specĆÄŔĎ> | <tarĆÄŔĎ> | <źŇ˝ş ĆĐĹ°Áö> ]:"
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr "źłÄĄ/ž÷ą×ˇšŔĚľĺ/ťčÁŚ żÉźÇ:"
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr "¸đľç rpm ¸đľĺżĄź­ŔÇ ŔĎšÝŔűŔÎ żÉźÇ:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM šöŔü - %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "ŔĚ ÇÁˇÎą×ˇĽŔş GNU Public License łťżĄź­ ŔÚŔŻˇÓ°Ô ŔçščĆ÷ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "* ťçżëšý: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr "--rcfile żÉźÇŔĚ ÁŚ°ĹľÇžú˝Ŕ´Ď´Ů.\n"
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "´ë˝Ĺ \"--macros <ĆÄŔĎ:..>\" Ŕť ťçżëÇŐ´Ď´Ů.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "ŔÎźö Ăł¸Ž°úÁ¤ (%d) ľľÁß łťşÎ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "ÇĎłŞŔÇ ÁÖ(major) ¸đľĺ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "ÁúŔÇ/°ËÁő ŔŻÇüŔş °˘°˘ ´Ů¸Ľ ŔŻÇü°ú ľż˝ĂżĄ źöÇŕÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "şÎŔűŔýÇŃ ÁúŔÇ ÇáĄą× ŔÔ´Ď´Ů"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "şÎŔűŔýÇŃ ÁúŔÇ Çü˝Ä ŔÔ´Ď´Ů"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "şÎŔűŔýÇŃ ÁúŔÇ źŇ˝ş ŔÔ´Ď´Ů"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath´Â ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ťçżëÇĎÁö žĘąâ Ŕ§ÇŃ żÉźÇŔÔ´Ď´Ů"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "źłÄĄ, ž÷ą×ˇšŔĚľĺ, źŇ˝ş ťčÁŚ, spec ĆÄŔĎ ťčÁŚ˝ĂżĄ¸¸ źöÇŕľË´Ď´Ů"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ĆÄŔĎŔť ŔçščÄĄÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix śÇ´Â --relocate żÉźÇ Áß ÇĎłŞ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate żÍ --excludepath żÉźÇŔş ĂÖ˝ĹŔÇ ĆĐĹ°Áö¸Ś źłÄĄÇŇ ś§żĄ¸¸ ťçżëÇŇ źö ŔÖ"
 "˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix żÉźÇŔş ĂÖ˝ĹŔÇ ĆĐĹ°Áö¸Ś źłÄĄÇŇ ś§żĄ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix żÉźÇŔÇ ŔÎźö´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs żÍ --includedocs żÉźÇ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches żÉźÇŔş ĆĐĹ°Áö ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles żÉźÇŔş ĆĐĹ°Áö źłÄĄ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "˝şĹŠ¸łĆŽ ÇŘÁŚ żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "ĆŽ¸Ž°Ĺ ÇŘÁŚ żÉźÇŔş ĆĐĹ°Áö źłÄĄżÍ ťčÁŚ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -341,13 +249,13 @@ msgstr ""
 "--nodeps żÉźÇŔş ĆĐĹ°Áö ÁŚŔŰ, ŔçÁŚŔŰ(rebuild), ŔçÄÄĆÄŔĎ(recompile), źłÄĄ, ťč"
 "ÁŚ, °ËÁő˝ĂżĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test żÉźÇŔş ĆĐĹ°Áö źłÄĄ, ťčÁŚ, ÁŚŔ۽ÿĄ¸¸ ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -355,81 +263,81 @@ msgstr ""
 "--root (-r) żÉźÇŔş ĆĐĹ°Áö źłÄĄ, ťčÁŚ, ÁúŔÇ, ľĽŔĚĹÍşŁŔĚ˝ş Ŕ繸Ăŕ˝ĂżĄ¸¸ ÁöÁ¤ÇŇ "
 "źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) żÉźÇŔÇ ŔÎźö´Â šÝľĺ˝Ă '/' ˇÎ ˝ĂŔŰÇŘžß ÇŐ´Ď´Ů"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "ź­¸íÇŇ ĆÄŔĎŔĚ žř˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s ĆÄŔĎżĄ Á˘ąŮÇŇ źö žř˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp¸Ś ĂŁŔť źö žřŔ˝: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "ĆĐ˝ş ą¸šŽ(pass phrase) ŔÔˇÂ: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "ĆĐ˝ş ą¸šŽ(pass phrase)ŔĚ żĂšŮ¸ŁÁö žĘ˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "ĆĐ˝ş ą¸šŽ(pass phrase)ŔĚ ŔĎÄĄÇŐ´Ď´Ů.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "¸ĹĹŠˇÎ ĆÄŔĎżĄ şÎŔűÇŐÇŃ %%_signatureŔÇ łťżëŔĚ ŔÖ˝Ŕ´Ď´Ů.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign żÉźÇŔş ĆĐĹ°Áö ÁŚŔ۽ÿĄ¸¸ ťçżëÇŇ źö ŔÖ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "˝ÇÇ࿥ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "ŔçÁŚŔŰ(rebuild)ÇŇ ĆĐĹ°Áö ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ spec ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ÇĘżäÇŃ tar ĆÄŔĎŔĚ ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr "ťčÁŚÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "źłÄĄÇŇ ĆĐĹ°Áö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "°ËÁőżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags żÉźÇżĄ şÎŔűŔýÇŃ ŔÎźö°Ą ÁöÁ¤ľÇžú˝Ŕ´Ď´Ů "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "ÁúŔÇżĄ ÇĘżäÇŃ ŔÎźö°Ą ÁöÁ¤ľÇÁö žĘžŇ˝Ŕ´Ď´Ů"
@@ -1217,7 +1125,7 @@ msgstr "ĆĐĹ°Áö ÁŚŔŰżĄ ČŁČŻÇĎ´Â žĆĹ°ĹŘĂĸŚ ĂŁŔť źö žř˝Ŕ´Ď´Ů\n"
 msgid "Package has no %%description: %s\n"
 msgstr "ĆĐĹ°ÁöżĄ %%descriptionŔĚ žřŔ˝: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot´Â ŔĚšĚ ÁöÁ¤ľÇžî ŔÖ˝Ŕ´Ď´Ů, %s(Ŕť)¸Ś šŤ˝ĂÇŐ´Ď´Ů\n"
@@ -1645,17 +1553,107 @@ msgstr "%s: readLeadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: FreadŔĚ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "<ÇĽÇö˝Ä>+ ŔÇ ¸ĹĹŠˇÎ ČŽŔĺŔť ĂâˇÂÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ąâşť ¸ĹĹŠˇÎ ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ĆĐĹ°ÁöŔÇ žĆĹ°ĹŘĂĸŚ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "libio(3) APIŔÇ ťçżëŔť ÇŘÁŚÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "ÇĽÁŘĂâˇÂŔť <¸íˇÉ>Ŕ¸ˇÎ ş¸łŔ´Ď´Ů"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "<ľđˇşĹ与>¸Ś ĂÖťóŔ§ ľđˇşĹ与ˇÎ ťçżëÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "ÇöŔç źłÁ¤ľÇžî ŔÖ´Â rpmrcŔÇ łťżë°ú ¸ĹĹŠˇÎ¸Ś ş¸żŠÁÝ´Ď´Ů"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "ŔÚźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "žĆÁÖ ťóźźÇŃ ĂâˇÂŔť ÁŚ°řÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "ÇöŔç ťçżëľÇ°í ŔÖ´Â rpm šöŔüŔť ÇĽ˝ĂÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "ľĽŔĚĹÍ ˝şĆŽ¸˛ ÇÁˇÎĹäÄÝŔť ľđšöą× ÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "ŔÎźö Ăł¸Ž°úÁ¤ (%d) ľľÁß łťşÎ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "rpmio ŔÔ/ĂâˇÂŔť ľđšöą× ÇŐ´Ď´Ů"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "URL Äł˝Ă Çھ鸾Ŕť ľđšöą× ÇŐ´Ď´Ů"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1676,21 +1674,21 @@ msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '=' Ŕť Ć÷ÇÔÇŘžß ÇŐ´Ď´Ů"
 msgid "relocations must have a / following the ="
 msgstr "ŔçščÄĄ˝ĂżĄ´Â šÝľĺ˝Ă '=' ľÚżĄ '/' °Ą żÍžß ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr "ˇŃšé(rollback)ŔÇ ŔÎźö´Â ˝Ă°Ł/łŻÂĽ ˝şĹĆÇÁ ŔÔ´Ď´Ů"
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr "ˇŃšé(rollback)ŔÇ ŔÎźöŔÎ ˝Ă°Ł/łŻÂĽ ˝şĹĆÇÁ°Ą żĂšŮ¸ŁÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "ĆŻÁ¤ ĆÄŔĎŔť ťýˇŤÇĎąâ Ŕ§ÇŃ źłÁ¤ŔĚ ŔűżëľČ °ćżěżĄľľ, ĆĐĹ°Áö žČŔÇ ¸đľç ĆÄŔĎŔť źł"
 "ÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1698,155 +1696,144 @@ msgstr ""
 "<ĆĐĹ°Áö> Ŕ̸§°ú ŔĎÄĄÇĎ´Â ĆĐĹ°Áö´Â ¸đľÎ ÁŚ°ĹÇŐ´Ď´Ů (<ĆĐĹ°Áö>żĄ żŠˇŻ°łŔÇ ĆĐĹ°Áö"
 "¸Ś ľż˝ĂżĄ ÁöÁ¤ÇŇ °ćżěżĄ´Â żŔˇů°Ą šßťýÇŐ´Ď´Ů)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr "ĆĐĹ°Áö ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "ŔçščÄĄ ąâ´ÉŔĚ žř´Â ĆĐĹ°ÁöŔÇ ĆÄŔĎŔť ŔçščÄĄÇĎżŠ źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr "ÇĎşÎ-ľđˇşĹ与ˇÎ Ŕ̸§ şŻ°ć˝Ă ťčÁŚľČ ĆĐĹ°Áö ĆÄŔĎŔť ŔúŔĺÇŐ´Ď´Ů"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "ĆĐĹ°Áö¸Ś (ÁŚ°Ĺ) ťčÁŚÇŐ´Ď´Ů"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<ĆĐĹ°Áö>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "ĆĐĹ°ÁöżĄ Ć÷ÇÔľČ šŽź­ ĆÄŔĎŔť źłÄĄÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "<°ćˇÎ>ˇÎ ˝ĂŔ۾Ǵ ĆÄŔĎŔş źłÄĄÇĎÁö žĘ˝Ŕ´Ď´Ů "
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr "<°ćˇÎ>"
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs żÍ --replacefiles żÉźÇŔť ľż˝ĂżĄ ťçżëÇŐ´Ď´Ů"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr "ąâÁ¸żĄ źłÄĄľČ ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<ĆĐĹ°ÁöĆÄŔĎ>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "ĆĐĹ°Áö źłÄĄ¸Ś ÇؽøśĹŠ(#)ˇÎ ÇĽ˝ĂÇŐ´Ď´Ů (-v żÉźÇ°ú ÇÔ˛˛ ťçżëÇĎ´Â °ÍŔĚ ÁÁ˝Ŕ´Ď"
 "´Ů)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "ĆĐĹ°ÁöŔÇ žĆĹ°ĹŘĂĸŚ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "ĆĐĹ°ÁöŔÇ żîżľĂźÁŚ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇĎąâ ŔüżĄ ľđ˝şĹŠ °ř°ŁŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "ĆĐĹ°ÁöżĄ Ć÷ÇÔľČ šŽź­ ĆÄŔĎŔť źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "ĆÄŔϽýşĹŰŔť şŻ°ćÇĎÁö žĘ°í, ľĽŔĚĹÍşŁŔĚ˝ş¸Ś °ť˝ĹÇŐ´Ď´Ů"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "ĆÄŔĎŔÇ MD5 Ăŕžŕ(digest)Ŕť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ŔÇÁ¸źşŔĚ ŔÖ´Â ĆĐĹ°Áö¸Ś źłÄĄÇĎľľˇĎ Ŕçżäą¸ÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun ˝şĹŠ¸łĆ˛¸´(scriptlet)Ŕť ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "ĆĐĹ°ÁöŔÇ žĆĹ°ĹŘĂĸŚ °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 "ŔĚ ĆĐĹ°ÁöżĄ ŔÇÇŘ ťýźşľÇ´Â(triggered) žîś°ÇŃ ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö "
 "žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerprein ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerin ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerun ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "žîś°ÇŃ %%triggerpostun ˝şĹŠ¸łĆ˛¸´(scriptlet)ľľ ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1854,48 +1841,52 @@ msgstr ""
 "ŔĚŔü šöŔüŔÇ ĆĐĹ°ÁöˇÎ ´Ůżîą×ˇšŔĚľĺ ÇŐ´Ď´Ů (--force żÉźÇŔť ťçżë˝ĂżĄ´Â ŔĚ żÉźÇ"
 "ŔĚ ŔÚľżŔ¸ˇÎ ŔűżëľË´Ď´Ů)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "ĆĐĹ°Áö źłÄĄ¸Ś ĆŰźžĆŽ(%)ˇÎ ÇĽ˝ĂÇŐ´Ď´Ů"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "ŔçščÄĄ ąâ´ÉŔĚ ŔÖ´Â ĆĐĹ°ÁöŔÇ °ćżě, ÁöÁ¤ÇŃ <ľđˇşĹ与>ˇÎ ŔçščÄĄÇĎżŠ źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<ľđˇşĹ与>"
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr "<ŔĚŔü°ćˇÎ>żĄź­ <ťőˇÎżî°ćˇÎ>ˇÎ ĆÄŔĎŔť ŔçščÄĄ ÇŐ´Ď´Ů"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<ŔĚŔü°ćˇÎ>=<ťőˇÎżî°ćˇÎ>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr "ŔçĆĐĹ°ÂĄ(repackaging)Ŕ¸ˇÎ ŔÎÇŘ ťčÁŚľÇ´Â ĆĐĹ°Áö ĆÄŔĎŔť ŔúŔĺÇŐ´Ď´Ů"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "ĆĐĹ°Áö źłÄĄ˝Ă ąâÁ¸żĄ źłÄĄľÇžî ŔÖ´Â ĆÄŔĎŔť ľ¤žîžš´Ď´Ů"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "ĆĐĹ°Áö°Ą ŔĚšĚ źłÄĄľÇžî ŔÖ´Â °ćżěżĄľľ źłÄĄÇŐ´Ď´Ů"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "ťőˇÎ źłÄĄ ťčÁŚ, ŔĚŔü źłÄĄ Ŕ石ĥ, ĆĐĹ°Áö, <łŻÂĽ> şšą¸(back to date)"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr "<łŻÂĽ>"
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "ĆĐĹ°Áö¸Ś źłÄĄÇĎÁö žĘ°í, ÁŚ´ëˇÎ źłÄĄľÇ´ÂÁö¸¸ ČŽŔÎÇŐ´Ď´Ů"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "ĆĐĹ°Áö¸Ś ž÷ą×ˇšŔĚľĺ ÇŐ´Ď´Ů"
 
@@ -1925,8 +1916,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "Çě´ő ˝Äş°ŔÚ(identifier)¸Ś ťçżëÇĎżŠ ĆĐĹ°Áö¸Ś ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "ĆĐĹ°Áö ĆÄŔĎŔť ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů (żš: šŮŔ̳ʸŽ *.rpm ĆÄŔĎ)"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "¸đľç ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁőÇŐ´Ď´Ů"
 
 #: lib/poptQV.c:109
 msgid "query/verify package(s) with package identifier"
@@ -1973,124 +1965,116 @@ msgstr "ŔÇÁ¸źşŔť ÇĘżäˇÎ ÇĎ´Â ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "ŔÇÁ¸źşŔť ÁŚ°řÇĎ´Â ĆĐĹ°ÁöżĄ ´ëÇŘ ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "¸đľç źłÁ¤ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "¸đľç šŽź­ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "ąâşť ĆÄŔĎ Á¤ş¸¸Ś ş¸żŠÁÝ´Ď´Ů"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "ĆĐĹ°Áö žČŔÇ ĆÄŔĎŔť łŞż­ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr "%%ghost ĆÄŔĎŔť ťýˇŤÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr "%%license ĆÄŔĎŔť ťýˇŤÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr "%%readme ĆÄŔĎŔť ťýˇŤÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "´ŮŔ˝ŔÇ ÁúŔÇ Çü˝ÄŔť ťçżëÇϽʽÿä"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr "spec ĆÄŔĎ žČŔÇ i18n Ç׸ń(section)Ŕť ´ëĂź(substitute)ÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "łŞż­ľČ ĆÄŔĎŔÇ ťóĹÂ(state)¸Ś ş¸żŠÁÝ´Ď´Ů"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "ĆÄŔĎ ¸ńˇĎŔť ŔÚźźČ÷ ş¸żŠÁÝ´Ď´Ů"
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "ĆÄŔĎŔÇ MD5 Ăŕžŕ(digest)Ŕť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "ĆÄŔĎŔÇ żëˇŽŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "ĆÄŔĎŔÇ ˝Éşź¸Ż ¸ľĹŠ °ćˇÎ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "ĆÄŔĎŔÇ źŇŔŻŔÚ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "ĆÄŔĎŔÇ ą×ˇěŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr "ĆÄŔĎŔÇ ĂÖÁž şŻ°ć ˝Ă°ŁŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "ĆÄŔĎŔÇ ¸đľĺ¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "ĆĐĹ°Áö žČŔÇ ĆÄŔĎŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "%verifyscript¸Ś ˝ÇÇŕÇĎÁö žĘ˝Ŕ´Ď´Ů (ŔÖŔť °ćżě)"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "SHA1 Ăŕžŕ(digest) Çě´ő¸Ś °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ĆÄŔĎŔÇ MD5 Ăŕžŕ(digest)Ŕť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "ĆĐĹ°ÁöżĄ ź­¸íÇŐ´Ď´Ů (ąâÁ¸ŔÇ ź­¸íŔş ťčÁŚľË´Ď´Ů)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "ĆĐĹ°ÁöżĄ ź­¸íÇŐ´Ď´Ů (ąâÁ¸ŔÇ ź­¸íŔş ťčÁŚľË´Ď´Ů)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "ź­¸íŔť ŔŰźşÇŐ´Ď´Ů"
 
@@ -2439,36 +2423,36 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "%s ĆĐĹ°ÁöŔÇ ÇĘżäťçÇ×(łťżŞ)ŔĚ ¸¸ÁˇÇĎÁö žĘŔ˝: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr "========== ŔçščÄĄ\n"
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ÁŚżÜ  %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ŔçščÄĄ %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "%s%s multilib °ćˇÎ¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s(Ŕť)¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s(Ŕť)¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s ľđˇşĹ与¸Ś %s(Ŕ¸)ˇÎ ŔçščÄĄ ÇŐ´Ď´Ů\n"
@@ -2931,13 +2915,13 @@ msgstr "źŐťóľČ MD5 Ăŕžŕ(digest): ÁöżřÇĎÁö žĘŔ˝\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ź­¸í: size(%d)+pad(%d)\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok Ç᥹סΠŔÎÇŘ %s(Ŕť)¸Ś ťýˇŤÇŐ´Ď´Ů\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s ľđˇşĹ与¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
@@ -2950,7 +2934,7 @@ msgstr "%s ľđˇşĹ与¸Ś ÁŚżÜ˝ĂĹľ´Ď´Ů\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2963,7 +2947,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2971,21 +2955,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3569,64 +3553,54 @@ msgstr "%s(Ŕť)¸Ś ťýźşÇĎ´ÂľĽ ˝ÇĆĐÇÔ: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "%s ľđˇşĹ与¸Ś ťýźşÇŐ´Ď´Ů\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "¸đľç rpm ¸đľĺżĄź­ŔÇ ŔĎšÝŔűŔÎ żÉźÇ:"
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: żŠ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
@@ -3636,6 +3610,44 @@ msgstr "%s: żŠ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ŔĐ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
 
+#~ msgid "<cmd>"
+#~ msgstr "<¸íˇÉ>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "ąâşť ¸ĹĹŠˇÎ ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
+
+#~ msgid "<file:...>"
+#~ msgstr "<ĆÄŔĎ:..>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "ąâşť rpmrc ĆÄŔĎ ´ë˝Ĺ <ĆÄŔĎ:..>Ŕť ŔĐžîľéŔÔ´Ď´Ů"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "* ťçżëšý: %s {--help}\n"
+
+#~ msgid "The --rcfile option has been eliminated.\n"
+#~ msgstr "--rcfile żÉźÇŔĚ ÁŚ°ĹľÇžú˝Ŕ´Ď´Ů.\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "´ë˝Ĺ \"--macros <ĆÄŔĎ:..>\" Ŕť ťçżëÇŐ´Ď´Ů.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath´Â ľĽŔĚĹÍşŁŔĚ˝ş¸Ś ťçżëÇĎÁö žĘąâ Ŕ§ÇŃ żÉźÇŔÔ´Ď´Ů"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "ĆĐĹ°Áö ĆÄŔĎŔť ÁúŔÇ/°ËÁő ÇŐ´Ď´Ů (żš: šŮŔ̳ʸŽ *.rpm ĆÄŔĎ)"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "ĆÄŔĎ ¸ńˇĎŔť ŔÚźźČ÷ ş¸żŠÁÝ´Ď´Ů"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "ĆĐĹ°ÁöŔÇ ŔÇÁ¸źşŔť °ËťçÇĎÁö žĘ˝Ŕ´Ď´Ů"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "ĆĐĹ°ÁöŔÇ ź­¸íŔť °ËťçÇŐ´Ď´Ů"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "<şťšŽ>ŔÇ łťżë(value)Ŕ¸ˇÎ <Ŕ̸§> ¸ĹĹŠˇÎ¸Ś Á¤ŔÇÇŐ´Ď´Ů"
 
diff --git a/po/no.po b/po/no.po
index 51c7c4d70..bb4ad1f52 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -74,253 +74,161 @@ msgstr "feil under lesing av header fra pakke\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke gjenĺpne \"payload\": %s\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "skriv ut hvilken versjon av rpm som brukes"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "gi mindre detaljert info"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "gi mer detaljert info"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "skriv ut makroutvidelsen av <uttr>+"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "send stdout til <kmd>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<kmd>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "bruk <katalog> som toppnivĺkatalog"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<kat>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "les <fil:...> i stedet for standard makrofil(er)"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<fil:...>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "les <fil:...> i stedet for standard rpmrc-fil(er)"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "vis endelig rpmrc og makrokonfigurasjon"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "slĺ av bruk av libio(3) API"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "feilsřking pĺ protokoll-datastrřm"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "feilsřk rpmio I/U"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "feilsřk URL-cache hĺndtering"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versjon %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright Š 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Bruk: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Bruk -e eller --erase i stedet.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "kun ett střrre modi kan spesifiseres"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "én type spřrring/verifisering kan utfřres om gangen"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "uventede flagg for spřrring"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "ventet spřrringsformat"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "uventet spřrringskilde"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath oppgitt for operasjon som ikke bruker en database"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "kune en av --prefix eller --relocate kan brukes"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenter til --prefix mĺ begynne med en /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -328,7 +236,7 @@ msgstr ""
 "skript som slĺr av alternativer kan kun spesifiseres under pakkeinstallasjon "
 "og sletting"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -336,100 +244,100 @@ msgstr ""
 "alternativer som slĺr av utlřsing  kan kun spesifiseres under "
 "pakkeinstallasjon, og sletting"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "ingen filer ĺ signere\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan ikke aksessere fil %s\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp ikke funnet: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Skriv inn passord: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Passordsjekk feilet\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Passord er ok.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "kjřring feilet\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler oppgitt for ombygging"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "ingen spec-fil oppgitt for bygging"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "ingen tar-fil oppgitt for bygging"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "ingen argumenter oppgitt for spřrring"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "ingen argumenter oppgitt for verifisering"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "uventede argumenter til --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for spřrring"
@@ -1221,7 +1129,7 @@ msgstr "Ingen kompatible arkitekturer funnet for bygging\n"
 msgid "Package has no %%description: %s\n"
 msgstr "Pakken har ingen %%description: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "Feil under lesing av spec fil fra %s\n"
@@ -1644,17 +1552,107 @@ msgstr "%s: readLead feilet\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "skriv ut makroutvidelsen av <uttr>+"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "les <fil:...> i stedet for standard makrofil(er)"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "ikke verifiser pakkeavhengigheter"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ikke verifiser pakkearkitektur"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "slĺ av bruk av libio(3) API"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "verifiser pakkesignatur"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "send stdout til <kmd>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "bruk <katalog> som toppnivĺkatalog"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "vis endelig rpmrc og makrokonfigurasjon"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "gi mindre detaljert info"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "gi mer detaljert info"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "skriv ut hvilken versjon av rpm som brukes"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "feilsřking pĺ protokoll-datastrřm"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "feilsřk rpmio I/U"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "feilsřk URL-cache hĺndtering"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1675,19 +1673,19 @@ msgstr "relokasjoner mĺ inneholde et ="
 msgid "relocations must have a / following the ="
 msgstr "relokasjoner mĺ ha et / etter ="
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "installer alle filer, selv konfigurasjoner som ellers kan hoppes over"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1695,151 +1693,140 @@ msgstr ""
 "fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis "
 "<pakke> spesifiserer flere pakker)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr "ikke kjřr pakkespesifikke skriptlet"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "omplasser filer i ikke-omplasserbar pakke"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr "lagre slettede pakkefiler ved ĺ endre navn til underkatalog"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "slett (avinstaller) pakke"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<pakke>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "ikke installer dokumentasjon"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "hopp over filer med innledende komponent <sti> "
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr "<sti>"
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "forkortning for --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr "oppgrader pakke(r) hvis allerede installert"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<pakkefil>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "ikke verifiser operativsystem for pakken"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "ikke sjekk diskplass fřr installasjon"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "installer dokumentasjon"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "installer pakke"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "oppdater databasen, men ikke modifiser filsystemet"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ikke ordne pakkeinstallasjon for ĺ tilfredsstille avhengigheter"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "ikke kjřr noen %%pre skriptlet (hvis noen)"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "ikke kjřr %%post skriptlet (hvis noen)"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "ikke kjřr %%preun skriptlet (hvis noen)"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "ikke kjřr %%postun skriptlet (hvis noen)"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "ikke verifiser pakkeavhengigheter"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "ikke verifiser pakkearkitektur"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "verifiser pakkesignatur"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "Ikke kjřr noen skriptlets som utlřses av denne pakken"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "ikke kjřr %%triggerprein skriptlets"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "ikke kjřr %%triggerin skriptlets"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "ikke kjřr %%triggerun skriplets"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "ikke kjřr %%triggerpostun skriptlets"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1847,48 +1834,52 @@ msgstr ""
 "oppgrader til en gammel versjon av pakken (--force ved oppgraderinger gjřr "
 "dette automatisk)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "omplasser pakken til <kat>, hvis den er omplasserbar"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<kat>"
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr "omplasser filer fra sti <gml> til <ny>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<gml>=<ny>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr "lagre slettede pakkefiler ved ompakking"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "installer selv om pakken erstatter installerte filer"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "reinstaller selv om pakken allerede er installert"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 #, fuzzy
 msgid "<date>"
 msgstr "<sti>"
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "ikke installer, men si ifra om det ville virke eller ikke"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "oppgrader pakke(r)"
 
@@ -1920,8 +1911,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "spřr/verifiser pakke(r) som eier fil"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "spřr/verifiser pakker utlřst av <pakke>"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "spřr/verifiser alle pakker"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -1970,123 +1962,115 @@ msgstr "spřr etter etter pakker som trenger <funk> funksjonalitet"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "spřr etter pakker som tilbyr <funk> funksjonalitet"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "ikke verifiser střrrelse pĺ filer"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "ikke verifiser sti til symbolske lenker for filer"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "ikke verifiser eier av filer"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "ikke verifiser gruppe for filer"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr "ikke verifisert endringsdato for filer"
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "ikke verifiser modus for filer"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "ikke verifiser filer i pakke"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "ikke kjřr %verifyscript (hvis noen)"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ikke verifiser header SHA1 digest"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "signer en pakke (forkast nĺvćrende signatur)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifiser pakkesignatur"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signer en pakke (forkast nĺvćrende signatur)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "generer signatur"
 
@@ -2425,36 +2409,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omplasser %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relokerer %s til %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relokerer katalog %s til %s\n"
@@ -2910,13 +2894,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
@@ -2929,7 +2913,7 @@ msgstr "ekskluderer katalog %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2942,7 +2926,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2950,21 +2934,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3539,62 +3523,52 @@ msgstr "kunne ikke opprette %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verifiser pakkesignatur"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "ikke verifiser pakkeavhengigheter"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "verifiser pakkesignatur"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ĺpne feilet: %s\n"
@@ -3604,6 +3578,38 @@ msgstr "%s: ĺpne feilet: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
 
+#~ msgid "<cmd>"
+#~ msgstr "<kmd>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "les <fil:...> i stedet for standard makrofil(er)"
+
+#~ msgid "<file:...>"
+#~ msgstr "<fil:...>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "les <fil:...> i stedet for standard rpmrc-fil(er)"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Bruk: %s {--help}\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Bruk -e eller --erase i stedet.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath oppgitt for operasjon som ikke bruker en database"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "spřr/verifiser pakker utlřst av <pakke>"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "ikke verifiser pakkeavhengigheter"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "verifiser pakkesignatur"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "definer makro <navn> med verdi <kropp>"
 
diff --git a/po/pl.po b/po/pl.po
index 2200f2526..534176976 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -81,270 +81,176 @@ 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:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "wyświetl wersję używanego rpm-a"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "wyświetl wersję używanego rpm-a"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "przekaż standartowe wyjście do <komenda>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "użyj <katalogu> jako katalogu najwyższego poziomu"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 #, fuzzy
 msgid "Signature options:"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM wersja %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Program może być swobodnie rozpowszechniany na warunkach licencji GNU"
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Użycie: rpm {--help}"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Użyj -e lub --erase\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Błąd wewnętrzny w przetwarzaniu argumentu (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "tylko jeden główny tryb pracy może być podany"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "tylko jeden typ odpytywania/sprawdzania można wykonać na raz"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "błędna konstrukcja argumentów odpytywania"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "błędna konstrukcja argumentów odpytywania"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "błędna konstrukcja argumentów odpytywania"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath podano dla operacji nie używającej bazy"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "tylko instalację, uaktualnienie i usuwanie źródeł można wymusić"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "przesuwania plików można dokonać tylko w trakcie instalacji"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nie można jednocześnie użyć --prefix i --relocate"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 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"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix można użyć tylko w trakcie instalacji nowych pakietów"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty dla --prefix muszą się rozpoczynać od /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie można jednocześnie użyć --excludedocs i --includedocs"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches można użyć tylko w trakcie usuwania pakietów"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles można użyć tylko w trakcie instalacji pakietów"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 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"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options 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:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options 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:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -353,14 +259,14 @@ msgstr ""
 "--nodeps można użyć tylko w trakcie budowania, instalacji, usuwania lub "
 "sprawdzania pakietów"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 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"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -368,82 +274,82 @@ msgstr ""
 "--root (-r) można użyć tylko w trakcie instalacji, usuwania, sprawdzania "
 "pakietów lub przebudowywania bazy"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty dla --root (-r) muszą się rozpoczynać od /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "brak dostępu do pliku %s\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "nie znaleziono pgp: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Podaj hasło: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Weryfikacja hasła nieudana\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Hasło jest prawidłowe.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Błędny %%_signature spec w pliku makra.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign można użyć tylko w trakcie budowania pakietu"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "wykonanie nie powiodło się\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakietów do przebudowania"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "nie podano nazw plików spec do budowania"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "nie podano argumentów dla trybu zapytań"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "nie podano argumentów dla sprawdzania"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "nieoczekiwane argumenty dla --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "nie podano argumentów dla trybu zapytań"
@@ -1248,7 +1154,7 @@ msgstr "Nie można budować na takie architektury"
 msgid "Package has no %%description: %s\n"
 msgstr "Pakiet nie ma %%description: %s"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot był już wcześniej podany"
@@ -1692,16 +1598,106 @@ msgstr "%s: readLead nie powiodło się\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiodło się\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "wyświetl wersję używanego rpm-a"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "nie sprawdzaj zależności pakietu"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "nie sprawdzaj architektury systemu"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "sprawdź sygnaturę pakietu"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "przekaż standartowe wyjście do <komenda>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "użyj <katalogu> jako katalogu najwyższego poziomu"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "wyświetl wersję używanego rpm-a"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Błąd wewnętrzny w przetwarzaniu argumentu (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1722,21 +1718,21 @@ msgstr "specyfikacja przesunięcia musi zawierać ="
 msgid "relocations must have a / following the ="
 msgstr "specyfikacja przesunięcia musi zawierać / po ="
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 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"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1744,158 +1740,148 @@ msgstr ""
 "usuń wszystkie pakiety, które spełniają wzorzec <pakiet> (zazwyczaj "
 "wyświetlany jest błąd gdy <pakiet> opisuje wiele pakietów)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "nie można użyć ścieżki %s przy przesuwaniu pakietu %s-%s-%s"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "usuń (odinstaluj) pakiet"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "nie instaluj dokumentacji"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "pomiń pliki leżące w <ścieżce>"
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "pakiet %s-%s-%s jest już zainstalowany"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "        -p <nazwa pakietu>+ "
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "wyświetlaj znaki hash przy instalacji (fajne z -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "nie sprawdzaj architektury systemu"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "nie sprawdzaj rodzaju systemu operacyjnego"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "nie sprawdzaj zajętości dysku przed instalacją"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "zainstaluj dokumentację"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "instaluj pakiet"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "odśwież bazę, ale nie modyfikuj systemu plików"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "nie sprawdzaj zależności pakietu"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "nie sprawdzaj plików pakietu"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nie zmieniaj kolejności instalacji pakietów by zapewnić zależności"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nie wykonuj żadnych etapów"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nie wykonuj żadnych etapów"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nie wykonuj żadnych etapów"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nie wykonuj żadnych etapów"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "nie sprawdzaj zależności pakietu"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "nie sprawdzaj architektury systemu"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "sprawdź sygnaturę pakietu"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "odpytywanie pakietów zahaczanych przez pakiet"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nie wykonuj żadnych skryptów instalacyjnych"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1903,49 +1889,53 @@ msgstr ""
 "uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
 "uaktualniania)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "wyświetlaj stan instalacji w procentach"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "przesuń pliki pakietu do drzewa <katalog>, jeśli jest przesuwalny"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "przesuń pliki z drzewa <stara-ścieżka> do drzewa <nowa-ścieżka>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "      --relocate <stara-ścieżka>=<nowa-ścieżka>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "instaluj nawet gdy pakiet zastępuje inne zainstalowane pliki"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "przeinstaluj jeśli pakiet jest już zainstalowany"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "nie instaluj, podaj tylko czy instalacja zadziała czy nie"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "    --upgrade <nazwa pakietu>"
@@ -1982,8 +1972,8 @@ msgstr "sprawdzanie do jakiego pakietu należy plik"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "odpytywanie pakietu"
+msgid "query/verify a package file"
+msgstr "odpytuj wszystkie pakiety"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -2037,132 +2027,123 @@ msgstr "odszukaj pakiety wymagające zasobu <zas>"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "odszukaj pakiety udostępniające zasób <zas>"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "wyświetl wszystkie pliki konfiguracyjne"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "wyświetl wszystkie pliki dokumentacji"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "podaj postawowe informacje o pliku"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "wyświetl pliki zawarte w pakiecie"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead nie powiodło się\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "użyj następującego formatu zapytania"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "pakiet źródłowy nie zawiera pliku .spec"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "wyświetl status pokazywanych plików"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "wyświetl więcej informacji o plikach z listy"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "nie sprawdzaj plików pakietu"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "nie sprawdzaj zależności pakietu"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "nie wykonuj żadnych etapów"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "podpisz pakiet (porzuć bierzącą sygnaturę)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "sprawdź sygnaturę pakietu"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpisz pakiet (porzuć bierzącą sygnaturę)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "generuj sygnaturę PGP/GPG"
@@ -2509,36 +2490,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "zależności pakietu %s nie zostały spełnione: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Ten OS nie jest wspierany: %s"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "wyłączanie %s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "wyłączanie %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
@@ -3004,13 +2985,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominięty z powodu flagi missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
@@ -3023,7 +3004,7 @@ msgstr "tworzenie katalogu: %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3036,7 +3017,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3044,14 +3025,14 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 #, fuzzy
 msgid "repackage about-to-be-erased packages\n"
 msgstr "ten pakiet jest pakietem w wersji jeden!\n"
@@ -3059,7 +3040,7 @@ msgstr "ten pakiet jest pakietem w wersji jeden!\n"
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3643,63 +3624,53 @@ msgstr "utworzenie %s nie powiodło się\n"
 msgid "don't verify header+payload signature"
 msgstr "sprawdź sygnaturę pakietu"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "nie sprawdzaj zależności pakietu"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "sprawdź sygnaturę pakietu"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "tworzenie katalogu: %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Open nie powiodło się\n"
@@ -3709,6 +3680,32 @@ msgstr "%s: Open nie powiodło się\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiodło się\n"
 
+#, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Użycie: rpm {--help}"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Użyj -e lub --erase\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath podano dla operacji nie używającej bazy"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "odpytywanie pakietu"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "wyświetl więcej informacji o plikach z listy"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "nie sprawdzaj zależności pakietu"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "sprawdź sygnaturę pakietu"
+
 #~ msgid "removing these packages would break dependencies:\n"
 #~ msgstr "usunięcie tych pakietów zerwie zależności:\n"
 
diff --git a/po/pt.po b/po/pt.po
index 8421b4aa3..8ae3ee39a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -74,256 +74,164 @@ msgstr "erro ao ler o cabeçalho do pacote\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "năo consigo aceder de novo ao conteúdo: %s\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "imprime a versăo do RPM que está a usar"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "devolver um resultado menos detalhado"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "devolver um resultado mais detalhado"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "imprimir a expansăo da macro <expr>+"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "manda o stdout para <cmd>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<com>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "usa <dir> como a directoria de topo"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<dir>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "ler o <fich:...> em vez do(s) ficheiro(s) de macros por omissăo"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<fich:...>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "ler o <fich:...> em vez do(s) ficheiro(s) rpmrc por omissăo"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "mostra a configuraçăo final do rpmrc e das macros"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "desactivar o uso da API da libio(3)"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "depurar a sequęncia de dados do protocolo"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "depurar a E/S da rpmio"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "depurar a gestăo da 'cache' de URLs"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr "Opçőes de pesquisa (com o -q ou o --query):"
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr "Opçőes de verificaçăo (com o -V ou o --verify):"
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr "Opçőes de assinatura:"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr "Opçőes da base de dados:"
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Opçőes de criaçăo com [ <fich spec> | <fich tar> | <pacote fonte> ]:"
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr "Opçőes de Instalaçăo/Actualizaçăo/Remoçăo:"
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr "Opçőes comuns para todos os modos do rpm:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versăo %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Este programa pode ser distribuído livremente sob os termos da GPL da GNU"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Utilizaçăo: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr "A opçăo --rcfile foi eliminada.\n"
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Usar o \"--macros <fich:...>\" em alternativa.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "só pode ser especificado um 'major mode'"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "só pode ser realizado um tipo de pesquisa/verificaçăo de cada vez"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "opçőes de pesquisa inesperadas"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "formato de pesquisa inesperado"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "origem de pesquisa inesperada"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "o --dbpath foi usado numa operaçăo que năo precisa duma base de dados"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "só a instalaçăo, a actualizaçăo, o rmsource e o rmpspec podem ser forçados"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 "os ficheiros só podem ser mudados de sítio durante a instalaçăo do pacote"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "só uma das opçőes --prefix ou --relocate pode ser usada"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "o --relocate e o --excludepath só podem ser usados ao instalar pacotes novos"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "o --prefix só pode ser usado ao instalar pacotes novos"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "os argumentos do --prefix tęm de começar por /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "o --hash (-h) só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "o --percent só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "o --replacefiles só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "o --replacepkgs só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "o --excludedocs  só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "o --includedocs  só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "só uma das opçőes --excludedocs e --includedocs pode ser usada"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "o --ignorearch só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "o --ignoreos só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "o --ignoresize só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "o --allmatches só pode ser indicado ao apagar o pacote"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "o --allfiles só pode ser indicado durante a instalaçăo do pacote"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "o --justdb só pode ser indicado durante a instalaçăo ou a remoçăo do pacote"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -331,7 +239,7 @@ msgstr ""
 "a desactivaçăo de 'scripts' só pode ser indicado durante a instalaçăo ou a "
 "remoçăo de pacotes"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -339,7 +247,7 @@ msgstr ""
 "a desactivaçăo dos 'triggers' só pode ser usado durante a instalaçăo ou "
 "remoçăo de pacotes"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -347,7 +255,7 @@ msgstr ""
 "o --nodeps só pode ser indicado durante a criaçăo, reconstruçăo, "
 "recompilaçăo, instalaçăo, remoçăo ou verificaçăo do pacote"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -355,7 +263,7 @@ msgstr ""
 "o --test só pode ser indicado durante a instalaçăo, remoçăo ou criaçăo do "
 "pacote"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -363,81 +271,81 @@ msgstr ""
 "o --root (-r) só pode ser indicado durante a instalaçăo, remoçăo ou pesquisa "
 "do pacote ou na reconstruçăo da base de dados"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "os argumentos do --root (-r) tęm de começar por /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "năo existem ficheiros a assinar\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "năo consigo aceder ao ficheiro %s\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp năo encontrado: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Indique a palavra-chave: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "A verificaçăo da palavra-chave falhou\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "A palavra-chave está correcta.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Spec %%_signature inválido no ficheiro de macros.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "o --sign só pode ser usado na criaçăo do pacote"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "o exec falhou\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "năo foram indicados pacotes para a reconstruçăo"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "năo foram indicados ficheiros spec para a criaçăo"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "năo foram indicados ficheiros tar para a criaçăo"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr "năo foram indicados pacotes para apagar"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "năo foram indicados pacotes para instalar"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "năo foram indicados argumentos para a pesquisa"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "năo foram indicados argumentos para a verificaçăo"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos inesperados no --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "năo foram indicados argumentos para a pesquisa"
@@ -1227,7 +1135,7 @@ msgstr "Năo foram encontradas arquitecturas compatíveis para as quais criar\n"
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote năo tem uma %%description: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "O buildroot já foi especificado, a ignorar o %s\n"
@@ -1662,17 +1570,107 @@ msgstr ":%s: o readLead falhou\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "imprimir a expansăo da macro <expr>+"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ler o <fich:...> em vez do(s) ficheiro(s) de macros por omissăo"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "năo verificar as dependęncias do pacote"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "năo verifica a arquitectura do pacote"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "desactivar o uso da API da libio(3)"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "verificar a assinatura do pacote"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "manda o stdout para <cmd>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "usa <dir> como a directoria de topo"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "mostra a configuraçăo final do rpmrc e das macros"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "devolver um resultado menos detalhado"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "devolver um resultado mais detalhado"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "imprime a versăo do RPM que está a usar"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "depurar a sequęncia de dados do protocolo"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Erro interno no processamento de argumentos (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "depurar a E/S da rpmio"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "depurar a gestăo da 'cache' de URLs"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1693,21 +1691,21 @@ msgstr "os novos locais tęm de conter um ="
 msgid "relocations must have a / following the ="
 msgstr "os novos locais tęm de ter um / a seguir ao ="
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr "'rollback' recebe como argumento uma hora/data"
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr "argumento hora/data inválido para 'rollback'"
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instala todos os ficheiros, mesmo as configuraçőes que de outro modo seriam "
 "ignoradas"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1715,153 +1713,142 @@ msgstr ""
 "remove todos os pacotes que correspondam a <pacote> (normalmente aparece um "
 "erro se o <pacote> especifica vários pacotes)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr "năo executar nenhuns scripts do pacote"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "muda os ficheiros de sítio num pacote de localizaçăo fixa"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 "gravar os ficheiros do pacote apagado mudando o nome para sub-directoria"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "apaga (desinstala) o pacote"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<pacote>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "năo instala a documentaçăo"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "ignorar os ficheiros com a componente inicial <dir> "
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr "<caminho>"
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "abreviatura para --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr "actualizar o pacote(s) se já estiver instalado"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<pacote>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostra cardinais enquanto o pacote instala (conveniente com o -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "năo verifica a arquitectura do pacote"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "năo verifica o sistema operativo do pacote"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "năo verifica o espaço em disco antes de instalar"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "instala a documentaçăo"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "instala o pacote"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "actualiza a base de dados, mas năo altera o sistema de ficheiros"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "năo verifica as dependęncias do pacote"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "năo verificar o MD5 dos ficheiros"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "năo reorganiza a instalaçăo dos pacotes para satisfazer as dependęncias"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "năo executar o script %%pre (se existir)"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "năo executar o script %%post (se existir)"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "năo executar o script %%preun (se existir)"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "năo executar o script %%postun (se existir)"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "năo verificar as dependęncias do pacote"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "năo verifica a arquitectura do pacote"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "verificar a assinatura do pacote"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "năo executar nenhum dos scripts activados por este pacote"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerprein"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerin"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerun"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "năo executar nenhum dos scripts %%triggerpostun"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1869,47 +1856,51 @@ msgstr ""
 "actualiza para um versăo antiga do pacote (o --force faz isto "
 "automaticamente)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "mostra percentagens enquanto o pacote instala"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "muda o pacote para <dir>, se for possível"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<dir>"
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr "muda os ficheiros de <velho> para <novo>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<velho>=<novo>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr "gravar ficheiros apagados reempacotando-os"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "instala mesmo se o pacote substituir ficheiros instalados"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "reinstalar se o pacote já estiver presente"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "desinstalador novo, reinstalar velho, pacote(s) voltar ŕ <data>"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr "<data>"
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "năo instala, mas indica se iria funcionar ou năo"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "actualizar pacote(s)"
 
@@ -1939,9 +1930,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "pesquisar/verificar o(s) pacote(s) com o identificador do cabeçalho"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr ""
-"pesquisar/verificar um ficheiro do pacote (i.e. um ficheiro *.rpm binário)"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "pesquisar/verificar todos os pacotes"
 
 #: lib/poptQV.c:109
 msgid "query/verify package(s) with package identifier"
@@ -1988,124 +1979,116 @@ msgstr "pesquisar/verificar o(s) pacote(s) que precisa duma dependęncia"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "pesquisar/verificar o(s) pacote(s) que oferecem uma dependęncia"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "listar todos os ficheiros de configuraçăo"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "listar todos os ficheiros de documentaçăo"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "apresentar a informaçăo básica do ficheiro"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "listar os ficheiros no pacote"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr "ignorar ficheiros %%ghost"
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr "ignorar ficheiro %%licence"
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr "ignorar ficheiros %%readme"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "usar o formato de pesquisa seguinte"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr "substituir as secçőes i18n no ficheiro spec"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "mostrar os estados dos ficheiros listados"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "mostrar uma listagem descritiva do ficheiro"
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "năo verificar o MD5 dos ficheiros"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "năo verificar os tamanho dos ficheiros"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "năo verificar as ligaçőes simbólicas dos ficheiros"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "năo verificar o dono dos ficheiros"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "năo verificar o grupo dos ficheiros"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr "năo verificar hora de modificaçăo dos ficheiros"
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "năo verificar o modo dos ficheiros"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "năo verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "năo verificar as dependęncias do pacote"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "năo executar o %verifyscript (se existir)"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "năo verificar o SHA1 do cabeçalho"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "năo verificar o MD5 dos ficheiros"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "assinar um pacote (retira a assinatura actual)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verificar a assinatura do pacote"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "assinar um pacote (retira a assinatura actual)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "gerar a assinatura"
 
@@ -2451,36 +2434,36 @@ msgstr "  %s     A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "o pacote %s tem requisitos năo satisfeitos: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr "========== mudanças de local\n"
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d excluir o %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d mudar de local %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "a exclur a directoria 'multilib' %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "a excluir o %s %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "a mudar o %s para %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "a mudar a directoria %s para %s\n"
@@ -2942,13 +2925,13 @@ msgstr "'Digest' MD5 estragado: NĂO SUPORTADO\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido ŕ opçăo missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
@@ -2961,7 +2944,7 @@ msgstr "a excluir a directoria %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2974,7 +2957,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2982,21 +2965,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3574,64 +3557,54 @@ msgstr "năo consegui criar o %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verificar a assinatura do pacote"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "năo verificar as dependęncias do pacote"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "verificar a assinatura do pacote"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "a criar a directoria %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "Opçőes comuns para todos os modos do rpm:"
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: o acesso falhou: %s\n"
@@ -3641,6 +3614,46 @@ msgstr "%s: o acesso falhou: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: a leitura do manifesto falhou: %s\n"
 
+#~ msgid "<cmd>"
+#~ msgstr "<com>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "ler o <fich:...> em vez do(s) ficheiro(s) de macros por omissăo"
+
+#~ msgid "<file:...>"
+#~ msgstr "<fich:...>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "ler o <fich:...> em vez do(s) ficheiro(s) rpmrc por omissăo"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Utilizaçăo: %s {--help}\n"
+
+#~ msgid "The --rcfile option has been eliminated.\n"
+#~ msgstr "A opçăo --rcfile foi eliminada.\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Usar o \"--macros <fich:...>\" em alternativa.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr ""
+#~ "o --dbpath foi usado numa operaçăo que năo precisa duma base de dados"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr ""
+#~ "pesquisar/verificar um ficheiro do pacote (i.e. um ficheiro *.rpm binário)"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "mostrar uma listagem descritiva do ficheiro"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "năo verificar as dependęncias do pacote"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "verificar a assinatura do pacote"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "define a macro <nome> com o valor <conteúdo>"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9b2b81c16..e1c246021 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 
 #: build.c:40
 #, fuzzy
@@ -77,114 +77,37 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "mostra a verso do programa rpm sendo usado"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "mostra a verso do programa rpm sendo usado"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "envia a saida padro para <cmd>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "use <diretrio> como diretrio raiz"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 # , c-format
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -197,160 +120,143 @@ msgstr "No consegui ler o arquivo spec de %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verso %s\n"
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 "Este Software pode ser livremente redistribuido sob os termos da Licensa "
 "Pblica GNU (GPL)"
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "uso: rpm {--help}"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Use -e ou --erase no lugar.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "um tipo de pesquisa/verificao pode ser feita por vez"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 #, fuzzy
 msgid "unexpected query format"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "fonte de pesquisa no esperado"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath passado para uma operao que no usa um banco de dados"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "somente instalao e atualizao podem ser foradas"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 #, 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"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix somente pode ser usada quando se est instalando novos pacotes"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem comear com uma /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente podem ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante desinstalaes de pacotes"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalaes de pacotes"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
@@ -359,7 +265,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
@@ -368,7 +274,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -377,7 +283,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalaes e verificaes "
 "de pacotes"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -385,7 +291,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalaes e construes de "
 "pacotes"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -393,84 +299,84 @@ msgstr ""
 "--root (-r) somente pode ser especificado durante [des]instalaes, pesquisas "
 "e reconstruo de bancos de dados"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumentos para --root (-r) devem comear com uma /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 #, fuzzy
 msgid "pgp not found: "
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Checagem de pass phrase falhou\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Pass phrase ok.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign somente pode ser usado durante a construo de pacotes"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 #, fuzzy
 msgid "exec failed\n"
 msgstr "Construo falhou.\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "no foram passados pacotes para reconstruo"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "no foi passado arquivo spec para construo"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "no foram passados arquivos tar para construo"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "no foi passado argumento para pesquisa"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "no foi passado argumento para verificao"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos no esperados em --querytags"
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "no foi passado argumento para pesquisa"
@@ -1354,7 +1260,7 @@ msgid "Package has no %%description: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -1810,16 +1716,105 @@ msgstr "No consegui abrir: %s\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "mostra a verso do programa rpm sendo usado"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "no verifique as dependncias do pacote"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "no verifique a arquitetura do pacote"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "verifique a assinatura do pacote"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "envia a saida padro para <cmd>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "use <diretrio> como diretrio raiz"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "mostra a verso do programa rpm sendo usado"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1842,19 +1837,19 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1862,159 +1857,149 @@ msgstr ""
 "remova todos os pacotes iguais a <pacote> (normalmente um erro  gerado se "
 "<pacote> especificou mltiplos pacotes)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "no execute nenhuma script especfica do pacote"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "apague (desinstale) pacote"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "pesquise todos os pacotes"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "no instale documentao"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "alis para --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<estgio> <spec>    "
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 #, fuzzy
 msgid "don't verify package architecture"
 msgstr "no verifique a arquitetura do pacote"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "no verifique o sistema operacional do pacote"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "instale documentao"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "instale pacote"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "no verifique as dependncias do pacote"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "instale pacote"
+
+#: lib/poptI.c:215
 #, fuzzy
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "no verifique as dependncias do pacote"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "no verifique as dependncias do pacote"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "no verifique a arquitetura do pacote"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "verifique a assinatura do pacote"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "no execute nenhuma script especfica do pacote"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "no execute nenhuma script de instalao"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "no execute nenhuma script de instalao"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "no execute nenhuma script de instalao"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -2022,48 +2007,52 @@ msgstr ""
 "atualize para uma verso mais velha do pacote (--force em atualizaes no faz "
 "isto automaticamente)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "realoque o pacote para <diretrio>, se realocvel"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "instale mesmo que o pacote substitua arquivos j instalados"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "reinstale se o pacote j estiver presente"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "no instale, mas diga se a instalao funcionar ou no"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "instale pacote"
@@ -2100,7 +2089,7 @@ msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr "pesquise todos os pacotes"
 
 #: lib/poptQV.c:109
@@ -2156,140 +2145,130 @@ msgstr "pesquise pacotes que requerem capacidade <i>"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 #, fuzzy
 msgid "list all configuration files"
 msgstr "liste somente os arquivos de configurao (implica -l)"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instale documentao"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 #, fuzzy
 msgid "dump basic file information"
 msgstr "mostre informao do pacote"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 #, fuzzy
 msgid "list files in package"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
 # , c-format
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 #, fuzzy
 msgid "use the following query format"
 msgstr "fonte de pesquisa no esperado"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-#, fuzzy
-msgid "display a verbose file listing"
-msgstr "mostre a lista de arquivos do pacote"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "instale pacote"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "no verifique as dependncias do pacote"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifique a assinatura do pacote"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "gere assinatura PGP"
@@ -2646,7 +2625,7 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
@@ -2658,13 +2637,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2677,7 +2656,7 @@ msgstr "No consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "RPM verso %s\n"
@@ -2690,19 +2669,19 @@ msgstr "RPM verso %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -3186,7 +3165,7 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3200,7 +3179,7 @@ msgstr ""
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM verso %s\n"
@@ -3213,7 +3192,7 @@ msgstr "RPM verso %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3226,7 +3205,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3234,21 +3213,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3853,65 +3832,55 @@ msgstr "No consegui abrir o pipe tar: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verifique a assinatura do pacote"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "no verifique as dependncias do pacote"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "verifique a assinatura do pacote"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
 # , c-format
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "No consegui abrir: %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
 # , c-format
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "No consegui abrir: %s\n"
@@ -3923,6 +3892,33 @@ msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 #, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "uso: rpm {--help}"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Use -e ou --erase no lugar.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath passado para uma operao que no usa um banco de dados"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "pesquise todos os pacotes"
+
+#, fuzzy
+#~ msgid "display a verbose file listing"
+#~ msgstr "mostre a lista de arquivos do pacote"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "no verifique as dependncias do pacote"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "verifique a assinatura do pacote"
+
+#, fuzzy
 #~ msgid "removing these packages would break dependencies:\n"
 #~ msgstr "lista dependncias do pacote"
 
diff --git a/po/ro.po b/po/ro.po
index 02a24db16..32a939f4b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -73,353 +73,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1201,7 +1109,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1619,16 +1527,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1649,211 +1640,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1882,7 +1869,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1929,118 +1916,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2377,36 +2356,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2857,13 +2836,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2876,7 +2855,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2889,7 +2868,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2897,21 +2876,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3485,60 +3464,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index d7a9b5457..95cb1e4c7 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -79,353 +79,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1207,7 +1115,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1625,16 +1533,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1655,211 +1646,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1888,7 +1875,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1935,118 +1922,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2383,36 +2362,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2863,13 +2842,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2882,7 +2861,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2895,7 +2874,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2903,21 +2882,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3491,60 +3470,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 61a14c11a..7118cdba8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2002-04-09 16:44-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -76,259 +76,167 @@ msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÚÁÇĎĚĎ×ËÁ ÉÚ ĐÁËĹÔÁ\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐĎ×ÔĎŇÎĎ ĎÔËŇŮÔŘ payload: %s\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "×Ů×ĹÓÔÉ ÎĎÍĹŇ ×ĹŇÓÉÉ ÜÔĎĘ ĐŇÇŇÁÍÍŮ"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "×Ů×ĎÄÉÔŘ ÍÉÎÉÍŐÍ ÓĎĎÂÝĹÎÉĘ"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "×Ů×ĎÄÉÔŘ ÂĎĚĹĹ ÄĹÔÁĚŘÎŮĹ ÓĎĎÂÝĹÎÉŃ"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "×Ů×ĹÓÔÉ ÚÎÁŢĹÎÉĹ ÍÁËŇĎÓÁ <ÉÍŃ>+"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "ĐĎÓĚÁÔŘ ÓÔÁÎÄÁŇÔÎŮĘ ×Ů×ĎÄ × <cmd>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<ËĎÍÁÎÄÁ>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<ËÁÔÁĚĎÇ>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ÍÁËŇĎĆÁĘĚÁ(Ď×) ĐĎ ŐÍĎĚŢÁÎÉŔ"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<ĆÁĘĚ:...>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ ĐĎ ŐÍĎĚŢÁÎÉŔ"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "ĐĎËÁÚÁÔŘ ÔĹËŐÝĹĹ ÚÎÁŢĹÎÉĹ rpmrc É ÍÁËŇĎÓĎ×"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "ÚÁĐŇĹÔÉÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÉĹ libio(3) API"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "ĎÔĚÁÄËÁ ĐŇĎÔĎËĎĚÁ ĐĎÔĎËÁ ÄÁÎÎŮČ"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "ĎÔĚÁÄËÁ ĐŇĎĂĹÓÓÁ ××ĎÄÁ/×Ů×ĎÄÁ rpmio"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "ĎÔĚÁÄËÁ ĎÂŇÁÂĎÔËÉ URL ËÜŰ"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr "đÁŇÁÍĹÔŇŮ ÚÁĐŇĎÓÁ (Ó -q ÉĚÉ --query):"
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr "đÁŇÁÍĹÔŇŮ ĐŇĎ×ĹŇËÉ (Ó -V ÉĚÉ --verify):"
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr "đÁŇÁÍĹÔŇŮ ĐĎÄĐÉÓÉ:"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr "đÁŇÁÍĹÔŇŮ ÂÁÚŮ ÄÁÎÎŮČ"
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "đÁŇÁÍĹÔŇŮ ÓÂĎŇËÉ Ó [ <ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ> | <ÔÁŇ ÁŇČÉ×> | <ÉÓČĎÄÎŮĘ ĐÁËĹÔ> ]:"
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr "đÁŇÁÍĹÔŇŮ őÓÔÁÎĎ×ËÉ/ďÂÎĎ×ĚĹÎÉŃ/őÄÁĚĹÎÉŃ:"
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ×:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ×ĹŇÓÉŃ %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "üÔŐ ĐŇĎÇŇÁÍÍŐ ÍĎÖÎĎ Ó×ĎÂĎÄÎĎ ŇÁÓĐŇĎÓÔŇÁÎŃÔŘ ÎÁ ŐÓĚĎ×ÉŃČ GNU GPL"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "éÓĐĎĚŘÚĎ×ÁÎÉĹ: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr "×ÁŇÉÁÎÔ --rcfile ÂĎĚŘŰĹ ÎĹ ÉÓĐĎĚŘÚŐĹÔÓŃ.\n"
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "÷ÍĹÓÔĎ ÜÔĎÇĎ ÉÓĐĎĚŘÚŐĘÔĹ \"--macros <ĆÁĘĚ:...>\".\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ ĐŇÉ ĎÂŇÁÂĎÔËĹ ÁŇÇŐÍĹÎÔĎ× (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĎÓÎĎ×ÎŮČ ŇĹÖÉÍĎ×"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "ÚÁ ĎÄÉÎ ŇÁÚ ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚÎĹÎ ÔĎĚŘËĎ ĎÄÉÎ ÔÉĐ ĐŇĎ×ĹŇËÉ ÉĚÉ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ĆĚÁÇÉ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ĆĎŇÍÁÔ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "ÎĹĎÖÉÄÁÎÎŮĘ ÉÓÔĎŢÎÉË ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "ĐÁŇÁÍĹÔŇ --dbpath ÚÁÄÁÎ ÄĚŃ ĎĐĹŇÁĂÉÉ, ÎĹ ÉÓĐĎĚŘÚŐŔÝĹĘ ÂÁÚŐ ÄÁÎÎŮČ"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "ĐŇÉÎŐÄÉÔĹĚŘÎŮÍÉ ÍĎÇŐÔ ÂŮÔŘ ÔĎĚŘËĎ ŐÓÔÁÎĎ×ËÁ, ĎÂÎĎ×ĚĹÎÉĹ, ŐÄÁĚĹÎÉĹ ÉÓČĎÄÎÉËĎ× "
 "É ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "ĆÁĘĚŮ ÍĎÇŐÔ ÂŮÔŘ ĐĹŇĹÍĹÝĹÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 "ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ×ÁŇÉÁÎÔĎ× --prefix ÉĚÉ --relocate"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "×ÁŇÉÁÎÔŮ --relocate É --excludepath ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ "
 "ÎĎ×ŮČ ĐÁËĹÔĎ×"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "×ÁŇÉÁÎÔ --prefix ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÎĎ×ŮČ ĐÁËĹÔĎ×"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --prefix ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĎÄÉÎ ÉÚ ĐÁŇÁÍĹÔŇĎ× --excludedocs ÉĚÉ --"
 "includedocs"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -336,7 +244,7 @@ msgstr ""
 "ĐÁŇÁÍĹÔŇŮ ÚÁĐŇĹÔÁ ÓĂĹÎÁŇÉĹ× ÍĎÇŐÔ ÂŮÔŘ ŐËÁÚÁÎŮ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ "
 "ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -344,7 +252,7 @@ msgstr ""
 "ĐÁŇÁÍĹÔŇŮ ÚÁĐŇĹÔÁ ÔŇÉÇÇĹŇĎ× ÍĎÇŐÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ ÉĚÉ "
 "ŐÄÁĚĹÎÉÉ ĐÁËĹÔÁ(Ď×)"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -352,14 +260,14 @@ msgstr ""
 "--nodeps ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ, ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ĐŇĎ×ĹŇËÉ "
 "ĐÁËĹÔĎ×"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ É ÓÂĎŇËĹ ĐÁËĹÔÁ"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -367,81 +275,81 @@ msgstr ""
 "--root (-r) ÍĎÖĹÔ ÂŮÔŘ ŐËÁÚÁÎÁ ÔĎĚŘËĎ ĐŇÉ ŐÓÔÁÎĎ×ËĹ, ŐÄÁĚĹÎÉÉ, ÚÁĐŇĎÓÁČ "
 "ĐÁËĹÔÁ É ĐĹŇĹÓÔŇĎĹÎÉÉ ÂÁÚŮ ÄÁÎÎŮČ"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "ÁŇÇŐÍĹÎÔŮ ÄĚŃ --root (-r) ÄĎĚÖÎŮ ÎÁŢÉÎÁÔŘÓŃ Ó /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "ÎĹÔ ĆÁĘĚĎ× ÄĚŃ ĐĎÄĐÉÓÉ\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "ÎĹÔ ÄĎÓÔŐĐÁ Ë ĆÁĘĚŐ %s\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp ÎĹ ÎÁĘÄĹÎ: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "÷×ĹÄÉÔĹ ËĚŔŢĹ×ŐŔ ĆŇÁÚŐ: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "îĹ×ĹŇÎÁŃ ËĚŔŢĹ×ÁŃ ĆŇÁÚÁ\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "ëĚŔŢĹ×ÁŃ ĆŇÁÚÁ ĐŇÉÎŃÔÁ.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign ÍĎÖĹÔ ÂŮÔŘ ÉÓĐĎĚŘÚĎ×ÁÎ ÔĎĚŘËĎ ĐŇÉ ÓÂĎŇËĹ ĐÁËĹÔĎ×"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "ÚÁĐŐÓË ÎĹ ŐÄÁĚÓŃ\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ĐĹŇĹÓÂĎŇËÉ"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "ÎĹ ÚÁÄÁÎ ĆÁĘĚ ÓĐĹĂÉĆÉËÁĂÉÉ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "ÎĹ ÚÁÄÁÎŮ tar-ĆÁĘĚŮ ÄĚŃ ÓÂĎŇËÉ ĐÁËĹÔÁ"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÄÁĚĹÎÉŃ"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "ÎĹ ÚÁÄÁÎŮ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÄĚŃ ×ĹŇÉĆÉËÁĂÉÉ"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "ÎĹĎÖÉÄÁÎÎŮĹ ÁŇÇŐÍĹÎÔŮ ÄĚŃ --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "ÎĹ ÚÁÄÁÎŮ ÁŇÇŐÍĹÎÔŮ ÚÁĐŇĎÓÁ"
@@ -1229,7 +1137,7 @@ msgstr "îĹ ÎÁĘÄĹÎŮ ÓĎ×ÍĹÓÔÉÍŮĹ ÁŇČÉÔĹËÔŐŇŮ ÄĚŃ ÓÂĎŇËÉ.\n"
 msgid "Package has no %%description: %s\n"
 msgstr "đÁËĹÔ ÎĹ ÉÍĹĹÔ %%description: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot ŐÖĹ ŐËÁÚÁÎ, %s ÉÇÎĎŇÉŇŐĹÔÓŃ\n"
@@ -1667,17 +1575,107 @@ msgstr "%s: ĎŰÉÂËÁ readLead\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ Fread: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "×Ů×ĹÓÔÉ ÚÎÁŢĹÎÉĹ ÍÁËŇĎÓÁ <ÉÍŃ>+"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ÍÁËŇĎĆÁĘĚÁ(Ď×) ĐĎ ŐÍĎĚŢÁÎÉŔ"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÁŇČÉÔĹËÔŐŇŐ ĐÁËĹÔÁ"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "ÚÁĐŇĹÔÉÔŘ ÉÓĐĎĚŘÚĎ×ÁÎÉĹ libio(3) API"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "ĐĎÓĚÁÔŘ ÓÔÁÎÄÁŇÔÎŮĘ ×Ů×ĎÄ × <cmd>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ËÁÔÁĚĎÇ> ËÁË ËĎŇÎĹ×ĎĘ ËÁÔÁĚĎÇ"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "ĐĎËÁÚÁÔŘ ÔĹËŐÝĹĹ ÚÎÁŢĹÎÉĹ rpmrc É ÍÁËŇĎÓĎ×"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "×Ů×ĎÄÉÔŘ ÍÉÎÉÍŐÍ ÓĎĎÂÝĹÎÉĘ"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "×Ů×ĎÄÉÔŘ ÂĎĚĹĹ ÄĹÔÁĚŘÎŮĹ ÓĎĎÂÝĹÎÉŃ"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "×Ů×ĹÓÔÉ ÎĎÍĹŇ ×ĹŇÓÉÉ ÜÔĎĘ ĐŇÇŇÁÍÍŮ"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "ĎÔĚÁÄËÁ ĐŇĎÔĎËĎĚÁ ĐĎÔĎËÁ ÄÁÎÎŮČ"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "÷ÎŐÔŇĹÎÎŃŃ ĎŰÉÂËÁ ĐŇÉ ĎÂŇÁÂĎÔËĹ ÁŇÇŐÍĹÎÔĎ× (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "ĎÔĚÁÄËÁ ĐŇĎĂĹÓÓÁ ××ĎÄÁ/×Ů×ĎÄÁ rpmio"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "ĎÔĚÁÄËÁ ĎÂŇÁÂĎÔËÉ URL ËÜŰ"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1698,21 +1696,21 @@ msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÓĎÄĹŇÖÁÔŘ ="
 msgid "relocations must have a / following the ="
 msgstr "ĐĹŇĹÍĹÝĹÎÉŃ ÄĎĚÖÎŮ ÉÍĹÔŘ / ĐĎÓĚĹ ="
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr "ĎÔËÁÔ ÔŇĹÂŐĹÔ ÁŇÇŐÍĹÎÔ ×ŇĹÍĹÎÉ"
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr "ÎĹĐŇÁ×ÉĚŘÎŮĘ ĆĎŇÍÁÔ ×ŇĹÍĹÎÉ ĎÔËÁÔÁ"
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ×ÓĹ ĆÁĘĚŮ, ÄÁÖĹ ËĎÎĆÉÇŐŇÁĂÉĎÎÎŮĹ, ËĎÔĎŇŮĹ ÍĎÇĚÉ ÂŮ ÂŮÔŘ "
 "ĐŇĎĐŐÝĹÎŮ"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1720,151 +1718,140 @@ msgstr ""
 "ŐÄÁĚÉÔŘ ×ÓĹ ĐÁËĹÔŮ, ÓĎ×ĐÁÄÁŔÝÉĹ Ó <ĐÁËĹÔ> (ĎÂŮŢÎĎ, ĹÓĚÉ <ĐÁËĹÔ> "
 "ÓĎĎÔ×ĹÔÓÔ×ŐĹÔ ÎĹÓËĎĚŘËÉÍ ĐÁËĹÔÁÍ, ÇĹÎĹŇÉŇŐĹÔÓŃ ĎŰÉÂËÁ)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÎÉËÁËÉČ ÓĂĹÎÁŇÉĹ× ĐÁËĹÔÁ(Ď×)"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ × ÎĹĐĹŇĹÍĹÝÁĹÍĎÍ ĐÁËĹÔĹ"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr "ÓĎČŇÁÎÉÔŘ × ĐĎÄËÁÔÁĚĎÇĹ ĐĎÄĚĹÖÁÝÉĹ ŐÄÁĚĹÎÉŔ ĆÁĘĚŮ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "ŐÄÁĚÉÔŘ (ÄĹÉÎÓÔÁĚĚÉŇĎ×ÁÔŘ) ĐÁËĹÔ"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<ĐÁËĹÔ>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ × ĐŐÔÉ <ĐŐÔŘ>"
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr "<ĐŐÔŘ>"
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "ÓĎËŇÁÝĹÎÉĹ ÄĚŃ --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr "ĎÂÎĎ×ÉÔŘ ĐÁËĹÔ(Ů) ĹÓĚÉ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<ĆÁĘĚ ĐÁËĹÔÁ>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "×Ů×ĎÄÉÔŘ \"#\" ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ (ČĎŇĎŰĎ Ó -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÁŇČÉÔĹËÔŐŇŐ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĎĐĹŇÁĂÉĎÎÎŐŔ ÓÉÓÔĹÍŐ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÄÉÓËĎ×ĎĹ ĐŇĎÓÔŇÁÎÓÔ×Ď ĐĹŇĹÄ ŐÓÔÁÎĎ×ËĎĘ"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "ŐÓÔÁÎĎ×ÉÔŘ ÄĎËŐÍĹÎÔÁĂÉŔ"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "ŐÓÔÁÎĎ×ÉÔŘ ĐÁËĹÔ"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "ĎÂÎĎ×ÉÔŘ ÂÁÚŐ ÄÁÎÎŮČ, ÎĎ ÎĹ ÍĎÄÉĆÉĂÉŇĎ×ÁÔŘ ĆÁĘĚĎ×ŐŔ ÓÉÓÔĹÍŐ"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ÎÁ ËĎÎÔŇĎĚŘÎŐŔ ÓŐÍÍŐ MD5"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ÎĹ ÍĹÎŃÔŘ ĐĎŇŃÄĎË ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔĎ× ÄĚŃ ŐÄĎ×ĚĹÔ×ĎŇĹÎÉŃ ÚÁ×ÉÓÉÍĎÓÔĹĘ"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ  %%pre ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%post ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%preun ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%postun ÓĂĹÎÁŇÉĹ× (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÁŇČÉÔĹËÔŐŇŐ ĐÁËĹÔÁ"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ ÔŇÉÇÇĹŇ-ÓĂĹÎÁŇÉĹ×, ×Ú×ĹÄĹÎÎŮČ ÜÔÉÍ ĐÁËĹÔĎÍ"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerprein ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerin ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerun ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %%triggerpostun ÓĂĹÎÁŇÉĹ×"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1872,49 +1859,53 @@ msgstr ""
 "ĎÔËÁÔ ÎÁ ÂĎĚĹĹ ÓÔÁŇŐŔ ×ĹŇÓÉŔ ĐÁËĹÔÁ (--force ĐŇÉ ĎÂÎĎ×ĚĹÎÉÉ ÄĹĚÁĹÔ ÜÔĎ "
 "Á×ÔĎÍÁÔÉŢĹÓËÉ)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "×Ů×ĎÄÉÔŘ ĐŇĎĂĹÎÔ ÇĎÔĎ×ÎĎÓÔÉ ĐĎ ÍĹŇĹ ŐÓÔÁÎĎ×ËÉ ĐÁËĹÔÁ"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĐÁËĹÔ × <ËÁÔÁĚĎÇ>, ĹÓĚÉ ĐÁËĹÔ ÜÔĎ ĐĎÚ×ĎĚŃĹÔ"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<ËÁÔÁĚĎÇ>"
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr "ĐĹŇĹÍĹÓÔÉÔŘ ĆÁĘĚŮ ÉÚ ĐŐÔÉ <old> × <new>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<old>=<new>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr "ÓĎČŇÁÎÉÔŘ ĐĎÄĚĹÖÁÝÉĹ ŐÄÁĚĹÎÉŔ ĆÁĘĚŮ × ÎĎ×ĎÍ ĐÁËĹÔĹ"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, ÄÁÖĹ ĹÓĚÉ ĐÁËĹÔ ĐĹŇĹĐÉŰĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎÎŮĹ ĆÁĘĚŮ"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "ĐĹŇĹŐÓÔÁÎĎ×ÉÔŘ, ĹÓĚÉ ĐÁËĹÔ ŐÖĹ ŐÓÔÁÎĎ×ĚĹÎ"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 "ŐÄÁĚÉÔŘ ÎĎ×ŮĘ(Ĺ) ĐÁËĹÔ(Ů), ĐĹŇĹŐÓÔÁÎĎ×ÉÔŘ ÓÔÁŇŮĘ(Ĺ) ĐÁËĹÔ(Ů), ĎÂŇÁÔÎĎ ÎÁ "
 "ŐËÁÚÁÎÎŐŔ ÄÁÔŐ"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr "<ÄÁÔÁ>"
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "ÎĹ ŐÓÔÁÎÁ×ĚÉ×ÁÔŘ, Á ÔĎĚŘËĎ ÓĎĎÂÝÉÔŘ, ŐÄÁÓÔÓŃ ĚÉ ŐÓÔÁÎĎ×ËÁ"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "ĎÂÎĎ×ÉÔŘ ĐÁËĹÔ(Ů)"
 
@@ -1944,8 +1935,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔ(Ů), ĐĎ ÉÄĹÎÔÉĆÉËÁÔĎŇŐ ÚÁÇĎĚĎ×ËÁ"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĆÁĘĚ ĐÁËĹÔÁ (Ô.Ĺ. *.rpm ĆÁĘĚ Ä×ĎÉŢÎĎÇĎ ĐÁËĹÔÁ)"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ×ÓĹ ĐÁËĹÔŮ"
 
 #: lib/poptQV.c:109
 msgid "query/verify package(s) with package identifier"
@@ -1992,124 +1984,116 @@ msgstr "ÎÁĘÔÉ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔŮ, ÔŇĹÂŐŔÝÉĹ ÓĹŇ×ÉÓ"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "ÎÁĘÔÉ/ĐŇĎ×ĹŇÉÔŘ ĐÁËĹÔŮ, ĐŇĹÄĎÓÔÁ×ĚŃŔÝÉĹ ÓĹŇ×ÉÓ"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "ĐĎËÁÚÁÔŘ ×ÓĹ ĆÁĘĚŮ ËĎÎĆÉÇŐŇÁĂÉÉ"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "ĐĎËÁÚÁÔŘ ×ÓĹ ĆÁĘĚŮ ÄĎËŐÍĹÎÔÁĂÉÉ"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "ĐĎËÁÚÁÔŘ ĎÓÎĎ×ÎŐŔ ÉÎĆĎŇÍÁĂÉŔ Ď ĆÁĘĚĹ"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "ĐĎËÁÚÁÔŘ ÓĐÉÓĎË ĆÁĘĚĎ× ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ %%ghost"
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ %%license"
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr "ĐŇĎĐŐÓÔÉÔŘ ĆÁĘĚŮ %%readme"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "ÉÓĐĎĚŘÚŐĘÔĹ ÓĚĹÄŐŔÝÉĘ ĆĎŇÍÁÔ ÚÁĐŇĎÓÁ"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr "ÚÁÍĹÎÉÔŘ ÓĹËĂÉÉ i18n × ĆÁĘĚĹ ÓĐĹĂÉĆÉËÁĂÉÉ"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "ĐĎËÁÚÁÔŘ ÓĎÓÔĎŃÎÉĹ ĐĹŇĹŢÉÓĚĹÎÎŮČ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "ĐĎËÁÚÁÔŘ ÄĹÔÁĚŘÎŮĘ ÓĐÉÓĎË ĆÁĘĚĎ×"
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ÎÁ ËĎÎÔŇĎĚŘÎŐŔ ÓŐÍÍŐ MD5"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ŇÁÚÍĹŇ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐŐÔŘ ÓÉÍ×ĎĚÉŢĹÓËÉČ ÓÓŮĚĎË"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ČĎÚŃÉÎÁ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÇŇŐĐĐŐ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ×ŇĹÍŃ ÍĎÄÉĆÉËÁĂÉÉ ĆÁĘĚĎ×"
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĐŇÁ×Á ÄĎÓÔŐĐÁ ĆÁĘĚĎ× ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "ÎĹ ÉÓĐĎĚÎŃÔŘ %verifyscript (ĹÓĚÉ ĹÓÔŘ)"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ËĎÎÔŇĎĚŘÎŐŔ ÓŐÍÍŐ SHA1 ÚÁÇĎĚĎ×ËÁ ĐÁËĹÔÁ"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ĆÁĘĚŮ ÎÁ ËĎÎÔŇĎĚŘÎŐŔ ÓŐÍÍŐ MD5"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "ĐĎÄĐÉÓÁÔŘ ĐÁËĹÔ (ŐÄÁĚÉ× ÔĹËŐÝŐŔ ĐĎÄĐÉÓŘ)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "ĐĎÄĐÉÓÁÔŘ ĐÁËĹÔ (ŐÄÁĚÉ× ÔĹËŐÝŐŔ ĐĎÄĐÉÓŘ)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "ÇĹÎĹŇÉŇĎ×ÁÔŘ ĐĎÄĐÉÓŘ"
 
@@ -2452,36 +2436,36 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ĐÁËĹÔ %s ÓĎÄĹŇÖÉÔ ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÔŇĹÂĎ×ÁÎÉŃ: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr "========== ĐĹŇĹÍĹÝĹÎÉĘ\n"
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ÉÓËĚŔŢĹÎ %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ĐĹŇĹÍĹÝĹÎÉĹ %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ÉÓËĚŔŢÁĹÔÓŃ ÍÎĎÇĎÂÉÂĚÉĎÔĹŢÎŮĘ ĐŐÔŘ %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ÉÓËĚŔŢÁĹÔÓŃ %s %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ %s × %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ĐĹŇĹÍĹÝÁĹÔÓŃ ËÁÔÁĚĎÇ %s × %s\n"
@@ -2940,13 +2924,13 @@ msgstr "ëĎÎÔŇ. ÓŐÍÍÁ MD5 ĐĎ×ŇĹÖÄĹÎÁ: îĺ đďääĺňöé÷áĺôóń\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "đĎÄĐÉÓŘ: ŇÁÚÍĹŇ(%d)+ÚÁĐĎĚÎĹÎÉĹ(%d)\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ĐŇĎĐŐÝĹÎ ÉÚ-ÚÁ ĆĚÁÇÁ missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
@@ -2959,7 +2943,7 @@ msgstr "ÉÓËĚŔŢÁĹÔÓŃ ËÁÔÁĚĎÇ %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2972,7 +2956,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2980,21 +2964,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3573,64 +3557,54 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ÓĎÚÄÁÔŘ %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "ÓĎÚÄÁŁÔÓŃ ËÁÔÁĚĎÇ %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "ďÂÝÉĹ ĐÁŇÁÍĹÔŇŮ ÄĚŃ ×ÓĹČ ŇĹÖÉÍĎ×:"
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ: %s\n"
@@ -3640,6 +3614,44 @@ msgstr "%s: ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ĎŰÉÂËÁ ŢÔĹÎÉŃ ÓĐÉÓËÁ ĆÁĘĚĎ×: %s\n"
 
+#~ msgid "<cmd>"
+#~ msgstr "<ËĎÍÁÎÄÁ>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ÍÁËŇĎĆÁĘĚÁ(Ď×) ĐĎ ŐÍĎĚŢÁÎÉŔ"
+
+#~ msgid "<file:...>"
+#~ msgstr "<ĆÁĘĚ:...>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "ÉÓĐĎĚŘÚĎ×ÁÔŘ <ĆÁĘĚ:...> ×ÍĹÓÔĎ ĆÁĘĚÁ ÓĐĹĂÉĆÉËÁĂÉÉ ĐĎ ŐÍĎĚŢÁÎÉŔ"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "éÓĐĎĚŘÚĎ×ÁÎÉĹ: %s {--help}\n"
+
+#~ msgid "The --rcfile option has been eliminated.\n"
+#~ msgstr "×ÁŇÉÁÎÔ --rcfile ÂĎĚŘŰĹ ÎĹ ÉÓĐĎĚŘÚŐĹÔÓŃ.\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "÷ÍĹÓÔĎ ÜÔĎÇĎ ÉÓĐĎĚŘÚŐĘÔĹ \"--macros <ĆÁĘĚ:...>\".\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "ĐÁŇÁÍĹÔŇ --dbpath ÚÁÄÁÎ ÄĚŃ ĎĐĹŇÁĂÉÉ, ÎĹ ÉÓĐĎĚŘÚŐŔÝĹĘ ÂÁÚŐ ÄÁÎÎŮČ"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "ÚÁĐŇĎÓÉÔŘ/ĐŇĎ×ĹŇÉÔŘ ĆÁĘĚ ĐÁËĹÔÁ (Ô.Ĺ. *.rpm ĆÁĘĚ Ä×ĎÉŢÎĎÇĎ ĐÁËĹÔÁ)"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "ĐĎËÁÚÁÔŘ ÄĹÔÁĚŘÎŮĘ ÓĐÉÓĎË ĆÁĘĚĎ×"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "ÎĹ ĐŇĎ×ĹŇŃÔŘ ÚÁ×ÉÓÉÍĎÓÔÉ ĐÁËĹÔÁ"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "ĐŇĎ×ĹŇÉÔŘ ĐĎÄĐÉÓŘ × ĐÁËĹÔĹ"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "ĎĐŇĹÄĹĚÉÔŘ ÍÁËŇĎÓ <ÉÍŃ> ÓĎ ÚÎÁŢĹÎÉĹÍ <ĐĎÄÓÔÁÎĎ×ËÁ>"
 
diff --git a/po/sk.po b/po/sk.po
index e7b3c93bf..c5f27ddf3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -74,273 +74,179 @@ 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:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "vypísať verziu používaného rpm"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "vypísať verziu používaného rpm"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "poslať štandardný výstup do <príkazu>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "použiť <adresár> ako adresár najvyššej úrovne"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 #, fuzzy
 msgid "Signature options:"
 msgstr "Veľkosť podpisu:   %d\n"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzia %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Program môže byť voľne redistribuovaný v súlade s podmienkami GNU GPL"
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "použitie: rpm {--help}"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Namiesto nich použite -e alebo --erase.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "môže byť použitý iba jeden hlavný režim"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "naraz môže byť vykonaný jeden typ otázky alebo overenia"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "neočakávaný zdroj pre otázku"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath zadané pre operáciu nepoužívajúcu databázu"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 #, 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é"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "súbory môžu byť presunuté iba počas inčtalácie balíka"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "može byť použitá iba jedna z volieb --prefix a --relocate"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 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"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 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"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia začínať znakom /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 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"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "môže byť použitá iba jedna voľba z --excludedocs a --includedocs"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches môže byť použité iba počas odstránenia balíkov"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles môže byť použité iba počas inštalácie balíka"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 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"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options 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:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options 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:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -349,7 +255,7 @@ msgstr ""
 "--nodeps môže byť použité iba počas inštalácie, odstránenia alebo overenia "
 "balíka"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -357,7 +263,7 @@ msgstr ""
 "--test môže byť použité iba počas inštalácie, odstránenia alebo zostavenia "
 "balíka"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -365,82 +271,82 @@ 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"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia začínať znakom /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "nie je možné pracovať so súborom %s\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp nebolo nájdené: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Chybná špecifikácia %%_signature v makro-súbore.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign môže byť použíté iba počas zostavenia balíka"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "neboli zadané žiadne balíky pre znovuzostavenie"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "neboli zadané žiadne spec-súbory pre zostavenie"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "neboli zadané žiadne tar-súbory pre zostavenie"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "neboli zadané žiadne balíky pre inštaláciu"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "neboli zadané žiadne balíky pre inštaláciu"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "neboli zadané žiadne argumenty pre otázku"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "neboli zadané žiadne argumenty pre overenie"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "neočakávané argumenty pre --querytags"
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "neboli zadané žiadne argumenty pre otázku"
@@ -1244,7 +1150,7 @@ msgstr "Žiadne zostaviteľné architektúry"
 msgid "Package has no %%description: %s\n"
 msgstr "Balík neobsahuje %%description: %s"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot už bol zadaný"
@@ -1688,16 +1594,106 @@ msgstr "%s: readLead zlyhalo\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "vypísať verziu používaného rpm"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "neoverovať závislosti balíka"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "neoverovať architektúru balíka"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "overiť podpis balíka"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "poslať štandardný výstup do <príkazu>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "použiť <adresár> ako adresár najvyššej úrovne"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "vypísať verziu používaného rpm"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1718,21 +1714,21 @@ msgstr "presunutia musia obsahovať znak ="
 msgid "relocations must have a / following the ="
 msgstr "presunutia musia mať za znakom = znak /"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 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é"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1740,158 +1736,148 @@ msgstr ""
 "odinštalovať všetky balíky určené <balíkom> (inak je chybou, pokiaľ <balík> "
 "špecifikuje viac ako jeden balík)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "nevykonať žiadne skripty špecifikované balíkom"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "odinštalovať balík"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "neinštalovať dokumentáciu"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "vynechať súbory v ceste <cesta>"
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skratka pre --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "        -p <súbor_balíku>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "vypisovať značky počas inštalácie balíka (vhodné s -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "neoverovať architektúru balíka"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "neoverovať operačný systém balíka"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "pred inštaláciou nekontrolovať dostupné miesto na disku"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "inštalovať dokumentáciu"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "inštalovať balík"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "aktualizovať databázu bez zmeny súborového systému"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "neoverovať závislosti balíka"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "zobraziť súbory v balíku"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nemeniť poradie balíkov kvôli vyriešeniu závislostí"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "neoverovať závislosti balíka"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "neoverovať architektúru balíka"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "overiť podpis balíka"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "nevykonať žiadne skripty spúšťané týmto balíkom"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nevykonať žiadne skripty špecifikované balíkom"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nevykonať žiadne inštalačné skripty"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nevykonať žiadne inštalačné skripty"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nevykonať žiadne inštalačné skripty"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1899,49 +1885,53 @@ msgstr ""
 "aktualizovať na staršiu verziu balíka (--force to pri aktualizácii urobí "
 "automaticky)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "vypisovať percentá počas inštalácie balíka"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "presunúť balík do <adresára>, pokiaľ to balík povoľuje"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "presunúť súbory zo <starej_cesty> do <novej_cesty>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "inštalovať aj pokiaľ balík prepíše inštalované súbory"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "preinštalovať, pokiaľ už balík existuje"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "neinštalovať, ale oznámiť, či by to bolo možné"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "    --upgrade <súbor_balíka>"
@@ -1978,8 +1968,8 @@ msgstr "opýtať sa balíku vlastniaceho súbor"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "opýtať sa súboru balíka"
+msgid "query/verify a package file"
+msgstr "opýtať sa na všetky balíky"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -2033,134 +2023,125 @@ msgstr "opýtať sa na balíky vyžadujúce schopnosť <schopnosť>"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "opýtať sa na balíky poskytujúce schopnosť <schopnosť>"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "zobraziť všetky konfiguračné súbory"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 #, fuzzy
 msgid "list all documentation files"
 msgstr "zobraziť všetky dokumentačné súbory"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "zobraziť základné informácie o balíku"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "použiť nasledovný formát otázky"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "zdrojový balík neobsahuje žiadny .spec súbor"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "zobraziiť stav daných súborov"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "zobraziť podrobný zoznam súborov balíka"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "zobraziť súbory v balíku"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "neoverovať závislosti balíka"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "nevykonať žiadne etapy"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "zobraziť súbory v balíku"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "podpísať balík (zničiť aktuálny podpis)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "overiť podpis balíka"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpísať balík (zničiť aktuálny podpis)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "vytvoriť PGP/GPG podpis"
@@ -2507,36 +2488,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "požiadavka balíka %s nie je uspokojená: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vynechaný: %s"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "presúva sa %s do %s\n"
@@ -3000,13 +2981,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
@@ -3019,7 +3000,7 @@ msgstr "vytvára sa adresár %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3032,7 +3013,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3040,14 +3021,14 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 #, fuzzy
 msgid "repackage about-to-be-erased packages\n"
 msgstr "balík je verzie jedna!\n"
@@ -3055,7 +3036,7 @@ msgstr "balík je verzie jedna!\n"
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3639,63 +3620,53 @@ msgstr "nepodarilo sa vytvoriť %s\n"
 msgid "don't verify header+payload signature"
 msgstr "overiť podpis balíka"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "neoverovať závislosti balíka"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "overiť podpis balíka"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "vytvára sa adresár %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: otvorenie zlyhalo\n"
@@ -3705,6 +3676,32 @@ msgstr "%s: otvorenie zlyhalo\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
+#, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "použitie: rpm {--help}"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Namiesto nich použite -e alebo --erase.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath zadané pre operáciu nepoužívajúcu databázu"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "opýtať sa súboru balíka"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "zobraziť podrobný zoznam súborov balíka"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "neoverovať závislosti balíka"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "overiť podpis balíka"
+
 #~ msgid "removing these packages would break dependencies:\n"
 #~ msgstr "odstránenie týchto balíkov by porušilo závislosti:\n"
 
diff --git a/po/sl.po b/po/sl.po
index 7d6b5ae65..0ae3446ad 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.288 2002/07/25 23:37:05 jbj Exp $
+# $Id: sl.po,v 1.289 2002/07/28 00:42:13 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -79,269 +79,175 @@ 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:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "različica rpm, ki jo uporabljate"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "uporabljana različica rpm"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "standardni izhod preusmerjen na <ukaz>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "uporabi <imenik> za korenski imenik"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "prikaži končni rpmrc in nastavitev makra"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 #, fuzzy
 msgid "Signature options:"
 msgstr "Dolž. podpisa : %d\n"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM različica %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Ta program je dovoljeno razpečevati pod pogoji navedenimi v GNU GPL."
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Uporaba: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Namesto njiju uporabite -e ali --erase.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "izbran sme biti le en glavni način"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo en tip poizvedbe/preverjanja je možen naenkrat"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "nepričakovane zastavice pri poizvedbi"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "nepričakovana oblika poizvedbe"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "nepričakovan izvor poizvedbe"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath podan, vendar, čeprav nepotreben"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "izbiri --prefix in --relocate se medsebojno izključujeta"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix se sme uporabiti le pri namestitvi"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo začeti z /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "izbiri --excludedocs in --includedocs se medsebojno izključujeta"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sme podan le ob namestitvi paketa"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sme biti podati le ob namestitvi paketa"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -349,14 +255,14 @@ msgstr ""
 "--nodeps sme biti podan le ob izgradnji, vnovični izgradnji, prevajanju, "
 "namestitvi, odstranitvi ali preverjanju paketa"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -364,82 +270,82 @@ msgstr ""
 "--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
 "vnovični izgradnji paketa"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo začeti z /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "ni datotek, ki bi jih lahko podpisal\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "dostop do datoteke %s ni možen\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp manjka: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspešno\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign sme biti podan le ob izgradnji paketa"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "izvajanje je bilo neuspešno\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovično izgradnjo niso navedeni"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "nepričakovani argumenti za --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
@@ -1245,7 +1151,7 @@ msgstr "Arhitektura za izgradnjo ni prisotna"
 msgid "Package has no %%description: %s\n"
 msgstr "V paketu manjka %%description: %s"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot je že določen"
@@ -1691,16 +1597,106 @@ msgstr "%s: readLead je bil neuspešen\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspešno: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "uporabljana različica rpm"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "brez preverjanja soodvisnosti paketa"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "brez preverjanja arhitekture paketa"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "preveri podpis paketa(-ov)"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "standardni izhod preusmerjen na <ukaz>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "uporabi <imenik> za korenski imenik"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "prikaži končni rpmrc in nastavitev makra"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "različica rpm, ki jo uporabljate"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1721,20 +1717,20 @@ msgstr "premikanja morajo vsebovati ="
 msgid "relocations must have a / following the ="
 msgstr "premikanja morajo imeti /, ki mu sledi ="
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "namestitev vseh datotek, vključno z nastavitvenimi, ki so sicer izpuščene"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1742,158 +1738,148 @@ msgstr ""
 "odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z "
 "napako, če paket <paket> določa več paketov)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "brez izvajanja skriptov paketa"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "izbriši (odstrani) paket"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "ni paketov\n"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "brez namestitve dokumentacije"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "preskok datotek v navedeni poti"
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "okrajšava za --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "paket %s-%s-%s je že nameščen"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "        -p <paket>+       "
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "brez preverjanja operacijskega sistema paketa"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "brez preverjanja prostora na disku pred nameščanjem"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "namesti dokumentacijo"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "nameščanje paketa"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "obnovi podatkovno zbirko, a ne spreminjaj datotečnega sistema"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "brez preverjanja datotek v paketu"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "brez preverjanja soodvisnosti paketa"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "brez preverjanja arhitekture paketa"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "preveri podpis paketa(-ov)"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "brez izvajanja katerihkoli skriptov, ki jih požene ta paket"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "brez izvajanja skriptov paketa"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1901,49 +1887,53 @@ msgstr ""
 "nadgraditev na starejšo različico paketa (--force pri nadgradnjah "
 "avtomatično vključi to izbiro)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "izpis odstotkov med namestitvijo"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "če je mogoče, bo paket prestavljen v imenik <imenik>"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "prestavljanje datoteke iz stare poti v novo"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "namesti, četudi paket piše prek že nameščene datoteke"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "ponovno namesti, če paket že obstaja"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "ne namesti, a ugotovi, če bi delovalo"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "    --upgrade <paket>      "
@@ -1980,8 +1970,8 @@ msgstr "poizvedba po paketu, ki vsebuje datoteko"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "poizvedba po paketu"
+msgid "query/verify a package file"
+msgstr "poizvedba/preverba po vseh paketih"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -2035,132 +2025,123 @@ msgstr "poizvedba po paketih, ki potrebujejo dano zmožnost <mož>"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "poizvedba po paketih, ki ponujajo dano zmožnost <mož>"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "izpis vseh dokumentacijske datoteke"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "iznos osnovnih podatkov o datoteki"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "izpis seznama datotek v paketu"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: readLead je bil neuspešen\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "uporabi naslednjo obliko poizvedbe"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "zamenjava razdeljkov I18N z naslednjim katalogom"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "izpis stanja seznama datotek"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "izpis obširnega seznama datotek"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "brez preverjanja datotek v paketu"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "podpiši paket(e) (trenutni podpis zavrzi)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "preveri podpis paketa(-ov)"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "podpiši paket(e) (trenutni podpis zavrzi)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "izdelava podpisa PGP/GPG"
@@ -2509,36 +2490,36 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je izključen: %s"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "izključevanje datoteke %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "izključevanje datoteke %s%s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
@@ -3003,13 +2984,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dolž. polnila : %d\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskočen zaradi manjkajoče zastavice OK\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izključevanje imenika %s\n"
@@ -3022,7 +3003,7 @@ msgstr "izključevanje imenika %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3035,7 +3016,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3043,14 +3024,14 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 #, fuzzy
 msgid "repackage about-to-be-erased packages\n"
 msgstr "paket je paket različica ena!\n"
@@ -3058,7 +3039,7 @@ msgstr "paket je paket različica ena!\n"
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3646,63 +3627,53 @@ msgstr "neuspešno ustvarjanje %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "preveri podpis paketa(-ov)"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "brez preverjanja soodvisnosti paketa"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "preveri podpis paketa(-ov)"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: odpiranje je bilo neuspešno: %s\n"
@@ -3712,6 +3683,32 @@ msgstr "%s: odpiranje je bilo neuspešno: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspešno: %s\n"
 
+#, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Uporaba: %s {--help}\n"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Namesto njiju uporabite -e ali --erase.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath podan, vendar, čeprav nepotreben"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "poizvedba po paketu"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "izpis obširnega seznama datotek"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "brez preverjanja soodvisnosti paketa"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "preveri podpis paketa(-ov)"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "definirajte makro <ime> z vrednostjo <telo>"
 
diff --git a/po/sr.po b/po/sr.po
index 39cdd15c3..54e8613bd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -71,271 +71,177 @@ msgstr "greška potrage za paketom %s\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "napiši verziju rpm-a koja se koristi"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "napiši verziju rpm-a koja se koristi"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "pošalji standardni izlaz u <komandu>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, fuzzy, c-format
 msgid "%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:238
+#: rpmqv.c:143
 #, fuzzy
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Možete slobodno distribuirati dalje pod odredbama GNU GPL"
 
-#: rpmqv.c:250
-#, fuzzy, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "korišćenje: {rpm --help}"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr ""
-
-#: rpmqv.c:611
-#, fuzzy
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Koristite -e ili --erase.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni režim može biti naveden"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo jedan tip upita/provere može biti urađen odjednom"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neočekivan izvor upita"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neočekivan izvor upita"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "neočekivan izvor upita"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "samo instalacija i ažuriranje mogu biti forsirane"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "datoteke mogu biti premeštene samo tokom instalacije paketa"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "samo jedno možete koristiti: --prefix ili --relocate"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate možete koristiti samo kad instalirate novi paket"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix možete koristiti samo kod instalacije novog paketa"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju početi znakom /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "samo jedno možete da navedete: --excludedocs ili --includedocs"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches možete koristiti samo kod brisanja paketa"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles možete koristiti samo kod instalacije paketa"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr "--justdb možete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -343,14 +249,14 @@ msgid ""
 msgstr ""
 "--nodeps možete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test možete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -358,84 +264,84 @@ msgstr ""
 "--root (-r) možete navesti samo kod instalacije, uklanjanja, upita ili "
 "rekreiranja baze podataka"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju početi znakom /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datoteka nije pronađena na serveru"
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign se može koristiti samo kod kreiranja paketa"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "neočekivani argumenti za --querytags"
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
@@ -1229,7 +1135,7 @@ msgstr "nemoj proveravati arhitekturu paketa"
 msgid "Package has no %%description: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, fuzzy, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "Neuspelo čitanje %s: %s."
@@ -1676,16 +1582,105 @@ msgstr "%s: Neuspeo 'readLead'\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "napiši verziju rpm-a koja se koristi"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "nemoj proveravati zavisnosti paketa"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "nemoj proveravati arhitekturu paketa"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "proveri potpis u paketu"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "pošalji standardni izlaz u <komandu>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "koristi <dir> kao direktorijum najvišeg nivoa"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "napiši verziju rpm-a koja se koristi"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1707,20 +1702,20 @@ msgstr "premeštanja moraju imati znak ="
 msgid "relocations must have a / following the ="
 msgstr "premeštanja moraju imati / praćeno sa ="
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 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"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1728,207 +1723,201 @@ msgstr ""
 "ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se greška ako "
 "<paket> označava više paketa)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 #, fuzzy
 msgid "do not execute package scriptlet(s)"
 msgstr "nemoj izvršiti nijedan skript iz paketa"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "izbriši (deinstaliraj) paket"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 #, fuzzy
 msgid "<package>+"
 msgstr "upit nad svim paketima"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "nemoj da instaliraš dokumentaciju"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skraćenica za --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 #, fuzzy
 msgid "upgrade package(s) if already installed"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 #, fuzzy
 msgid "<packagefile>+"
 msgstr "    -b<faza> <spec>\t "
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 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)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "nemoj proveravati operativni sistem za paket"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "instaliraj dokumentaciju"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "ažuriraj bazu podataka, ali nemoj menjati fajl-sistem"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+#, fuzzy
+msgid "don't verify MD5 digest of files"
+msgstr "instaliraj paket"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, fuzzy, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, fuzzy, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, fuzzy, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, fuzzy, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "nemoj proveravati zavisnosti paketa"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "nemoj proveravati arhitekturu paketa"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "proveri potpis u paketu"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 #, fuzzy
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, fuzzy, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "nemoj izvršiti nijedan skript iz paketa"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, fuzzy, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "nemoj izvršiti nijedan instalacioni skript"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, fuzzy, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "nemoj izvršiti nijedan instalacioni skript"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, fuzzy, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "nemoj izvršiti nijedan instalacioni skript"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 "ažuriraj na staru verziju paketa (--force kod ažuriranja ovo radi automatski)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "piši procente instalacije paketa"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "premesti paket u <dir>, ako se može premestiti"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 #, fuzzy
 msgid "relocate files from path <old> to <new>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 #, fuzzy
 msgid "<old>=<new>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "instaliraj čak iako će paket zameniti instalirane datoteke"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "ponovo instaliraj ako je paket već prisutan"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "nemoj instalirati, ali reci da li će da radi ili ne"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 #, fuzzy
 msgid "upgrade package(s)"
 msgstr "instaliraj paket"
@@ -1965,7 +1954,7 @@ msgstr "upit nad paketom koji ima <datoteku>"
 
 #: lib/poptQV.c:107
 #, fuzzy
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr "upit nad svim paketima"
 
 #: lib/poptQV.c:109
@@ -2021,139 +2010,129 @@ msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "upit za pakete koji omogućavaju <i> svojstvo"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 #, fuzzy
 msgid "list all configuration files"
 msgstr "prikaži samo konfiguracione datoteke (povlači -i)"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instaliraj dokumentaciju"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 #, fuzzy
 msgid "dump basic file information"
 msgstr "prikaži informacije o paketu"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 #, fuzzy
 msgid "list files in package"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, fuzzy, c-format
 msgid "skip %%readme files"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 #, fuzzy
 msgid "use the following query format"
 msgstr "neočekivan izvor upita"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-#, fuzzy
-msgid "display a verbose file listing"
-msgstr "prikaži listu datoteka u paketu"
-
-#: lib/poptQV.c:233
-#, fuzzy
-msgid "don't verify MD5 digest of files"
-msgstr "instaliraj paket"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 #, fuzzy
 msgid "don't verify size of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 #, fuzzy
 msgid "don't verify symlink path of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 #, fuzzy
 msgid "don't verify owner of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 #, fuzzy
 msgid "don't verify group of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 #, fuzzy
 msgid "don't verify mode of files"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 #, fuzzy
 msgid "don't verify files in package"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 #, fuzzy
 msgid "don't verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "nemoj izvršiti nijednu fazu"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "potpiši paket (ukloni tekući potpis)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "proveri potpis u paketu"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "potpiši paket (ukloni tekući potpis)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 #, fuzzy
 msgid "generate signature"
 msgstr "napravi PGP potpis"
@@ -2500,36 +2479,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, fuzzy, c-format
 msgid "relocating %s to %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
@@ -2995,13 +2974,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
@@ -3014,7 +2993,7 @@ msgstr "greška kod kreiranja direktorijuma %s: %s"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -3027,7 +3006,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -3035,21 +3014,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3640,63 +3619,53 @@ msgstr "neuspelo kreiranje %s\n"
 msgid "don't verify header+payload signature"
 msgstr "proveri potpis u paketu"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "nemoj proveravati zavisnosti paketa"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "proveri potpis u paketu"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: Neuspelo otvaranje\n"
@@ -3706,6 +3675,33 @@ msgstr "%s: Neuspelo otvaranje\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
+#, fuzzy
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "korišćenje: {rpm --help}"
+
+#, fuzzy
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Koristite -e ili --erase.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
+
+#, fuzzy
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "upit nad svim paketima"
+
+#, fuzzy
+#~ msgid "display a verbose file listing"
+#~ msgstr "prikaži listu datoteka u paketu"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "nemoj proveravati zavisnosti paketa"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "proveri potpis u paketu"
+
 #~ msgid "removing these packages would break dependencies:\n"
 #~ msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n"
 
diff --git a/po/sv.po b/po/sv.po
index c7d470f38..deba4a1c4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2002-07-11 22:49+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -73,251 +73,161 @@ 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:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "visa vilken version av rpm som används"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "visa mindre detaljerad utdata"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "visa mer detaljerad utdata"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr "definiera MAKRO till värdet UTTR"
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr "'MAKRO UTTR'"
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr "skriv ut makroexpansion av UTTR"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr "'UTTR'"
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "skicka standard ut till <kommando>"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<kommando>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "använd <kat> som toppkatalog"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<kat>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "läs <fil:...> istället för standardmakrofil(er)"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<fil:...>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "läs <fil:...> istället för standard rpmrc-fil(er)"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "visa slutliga rpmrc- och makrokonfigurationer"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "deaktivera användningen av libio(3)-API:et"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "felsök protokolldataström"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "felsök rpmio I/O"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "felsök cache-hanteringen av URL:ar"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr "Frĺgeflaggor (med -q eller --query):"
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr "Verifieringsflaggor (med -V eller --verify):"
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr "Signaturflaggor:"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr "Databasflaggor:"
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr "Byggflaggor med [ <specfil> | <tar-arkiv> | <källpaket> ]:"
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr "Installera-/Uppdatera-/Raderaflaggor"
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr "Gemensamma flaggor för alla rpm-lägen:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+#: rpmqv.c:142
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright Š 1998-2002 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Det här programmet kan distribueras fritt enligt villkoren i GNU GPL"
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Användning: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr "Flaggan --rcfile har tagits bort.\n"
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Använd \"--macros <fil:...>\" istället.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Internt fel i argumenthantering (%d) :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "enbart ett huvudläge kan anges"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "endast en typ av frĺga/verifiering kan utföras ĺt gĺngen"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "oväntade frĺgeflaggor"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "oväntat frĺgeformat"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "oväntad frĺgekälla"
 
-#: rpmqv.c:738
-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:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "enbart en av --prefix eller --relocate kan användas"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 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"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast användas när nya paket installeras"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix mĺste börja med /"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs kan användas"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart användas när paket raderas"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart användas vid paketinstallation"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb kan enbart användas när paket installeras eller raderas"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -325,7 +235,7 @@ msgstr ""
 "skriptdeaktiveringsflaggor kan enbart användas när paket installeras eller "
 "raderas"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -333,7 +243,7 @@ msgstr ""
 "utlösardeaktiveringsflaggor kan enbart användas när paket installeras eller "
 "raderas"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -341,13 +251,13 @@ msgstr ""
 "--nodeps kan enbart användas när paket byggs, byggs om, kompileras om, "
 "installeras, raderas eller verifieras"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test kan enbart användas när paket installeras, raderas eller byggs"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -355,81 +265,81 @@ msgstr ""
 "--root (-r) kan enbart användas när paket installeras, raderas, frĺgas eller "
 "databasen byggs om"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) mĺste börja med /"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "inga filer att signera\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan inte komma ĺt filen %s\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp hittades inte: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Ange lösenfras: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av lösenfrasen misslyckades\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Lösenfrasen är ok.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Felaktig %%_signature-spec i makrofil.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign kan enbart användas vid pakettillverkning"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna för omtillverkning"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "inga specfiler angivna för tillverkning"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för tillverkning"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr "inga paket angivna att radera"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "inga paket angivna för installation"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna för frĺga"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna för verifiering"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "oväntade argument till --querytags "
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr "inga argument angivna"
 
@@ -1215,7 +1125,7 @@ msgstr "Hittade inga kompatibla arkitekturer att bygga\n"
 msgid "Package has no %%description: %s\n"
 msgstr "Paketet har ingen %%description: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot redan angett, ignorerar %s\n"
@@ -1642,16 +1552,103 @@ msgstr "%s: headerRead misslyckades\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr "definiera MAKRO till värdet UTTR"
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr "'MAKRO UTTR'"
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr "skriv ut makroexpansion av UTTR"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr "'UTTR'"
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "läs <FIL:...> istället för standardfil(er)"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr "<FIL:...>"
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr "verifiera inte paketkontrollsummor"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "verifiera inte paketarkitektur"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "deaktivera användningen av libio(3)-API:et"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr "verifiera inte paketsignatur(er)"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "skicka standard ut till <kommando>"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "använd <kat> som toppkatalog"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "visa slutliga rpmrc- och makrokonfigurationer"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "visa mindre detaljerad utdata"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "visa mer detaljerad utdata"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "visa vilken version av rpm som används"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "felsök protokolldataström"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "Internt fel i argumenthantering (%d) :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "felsök rpmio I/O"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "felsök cache-hanteringen av URL:ar"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr "%s: flaggtabell felkonfigurerad (%d)\n"
@@ -1672,20 +1669,20 @@ msgstr "omflyttningar mĺste innehĺlla ett ="
 msgid "relocations must have a / following the ="
 msgstr "omflyttningar mĺste ha ett / efter ="
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr "ĺterställning tar en tid-/datumstämpel som argument"
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr "felformaterat tid-/datumstämpelargument för ĺterställning"
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installera alla filer, även konfigurationer som annars kunde hoppats över"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1693,149 +1690,140 @@ msgstr ""
 "ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
 "anger flera paket)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr "kör inte paketskript"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "relokera filer i ej relokerbart paket"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr "spara raderade paketfiler genom att spara dem i underkatalog"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "radera (avinstallera) paket"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<paket>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "installera inte dokumentation"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "hoppa över filer med inledande <sökväg>"
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr "<sökväg>"
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "kortform för --replacepkgs --replacefiles"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr "uppgradera paket om redan installerat/de"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<paketfil>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "skriv ut brädgĺrdar allteftersom paketet installeras (bra tillsammans med -v)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "verifiera inte paketarkitektur"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "verifiera inte paketets operativsystem"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "kontrollera inte diskutrymme före installation"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "installera dokumentation"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr "installera paket"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "uppdatera databasen, men ändra inte filsystemet"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "verifiera inte MD5-summor för filer"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr "föreslĺ inte lösning(ar) pĺ saknade beroenden"
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%pre-skript"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%post-skript"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%preun-skript"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "utför inte (eventuellt) %%postun-skript"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr "verifiera inte paketkontrollsummor"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "verifiera inte paketarkitektur"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr "verifiera inte paketsignatur(er)"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "kör inte skript utlösta av detta paket"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "kör inte %%triggerprein-skript"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "kör inte %%triggerin-skript"
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "kör inte %%triggerun-skript"
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "kör inte %%triggerpostun-skript"
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1843,47 +1831,51 @@ msgstr ""
 "uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
 "detta automatiskt)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "skriv procent allt eftersom paketet installeras"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "flytta paketet till <katalog>, om flyttbart"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<kat>"
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr "relokera filer frĺn <gammal> till <ny>"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<gammal>=<ny>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr "spara raderade paketfiler genom ompaketering"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "installera även om paketet byter ut installerade filer"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "installera om ifall paketet redan är installerat"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr "avinstallera nya, ominstallera gamla, paket tillbaka till <datum>"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr "<datum>"
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "uppgradera paket"
 
@@ -1912,8 +1904,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "frĺga/verifiera paket med huvudidentifierare"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr "frĺga/verifiera en paketfil (t.ex. en binär *.rpm-fil)"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "frĺga/verifiera alla paket"
 
 #: lib/poptQV.c:109
 msgid "query/verify package(s) with package identifier"
@@ -1959,118 +1952,110 @@ msgstr "frĺga/verifiera paket som behöver ett beroende"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "frĺga/verifiera paket som tillhandahĺller ett beroende"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "lista alla konfigurationsfiler"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "lista alla dokumentationsfiler"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "visa filinformation"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "lista filer i paketet"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr "hoppa över %%ghost-filer"
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr "hoppa över %%license-filer"
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr "hoppa över %%readme-filer"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "använd följande frĺgeformat"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr "ersätt översatta sektioner till specfil"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "visa tillstĺnd för de listade filerna"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "visa en utförlig fillistning"
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "verifiera inte MD5-summor för filer"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "verifiera inte storlekar pĺ filer"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "verifiera inte sökvägen i symboliska länkar"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "verifiera inte ägare till filer"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "verifiera inte grupper till filer"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr "verifiera inte modifikationstiden för filer"
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "verifiera inte rättigheter för filer"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "verifiera inte filerna i paketet"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr "utför inte verify-skript"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "verifiera inte GPG V3 DSA-signatur(er)"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "verifiera inte PGP V3 RSA/MD5-signatur(er)"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr "signera paket (detsamma som --resign)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr "verifiera paketsignatur(er)"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr "importera en publik nyckel med skal"
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr "signera paket (detsamma som --addsign)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "generera signatur"
 
@@ -2411,36 +2396,36 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s har ouppfyllda %s: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr "========== omflyttningar\n"
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d utesluter  %s\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d flyttar om %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "hoppar över multilib-sökväg %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "hoppar över %s %s\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
@@ -2893,13 +2878,13 @@ msgstr "Trasig MD5-summa: STÖDS EJ\n"
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: OKÄND (%d)\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad pĺ grund av missingok-flagga\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
@@ -2912,7 +2897,7 @@ msgstr "hoppar över katalogen %s\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2925,7 +2910,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2933,21 +2918,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3521,60 +3506,52 @@ msgstr "kunde inte skapa %s: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verifiera inte huvud+lastsignatur"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr "verifiera inte paketkontrollsummor"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr "verifiera inte paketsignatur"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr "uppdatera inte cachedatabasen, skriv bara ut paketsökvägar"
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr "följ kommandoradssymlänkar"
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr "genomlöp logiskt"
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr "byt inte katalog"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr "hämta inte statusinfo"
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr "genomlöp fysiskt"
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr "returnera punkt som punkt-punkt"
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr "gĺ inte mellan enheter"
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr "returnera belyst information"
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr "Gemensamma flaggor för alla rpm-lägen och binärer:"
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr "%s: %%{_cache_dbpath}-makro är felkonfigurerat.\n"
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: cacheoperation misslyckades: ec %d.\n"
@@ -3583,3 +3560,39 @@ msgstr "%s: cacheoperation misslyckades: ec %d.\n"
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: läsning av paketlista misslyckades: %s\n"
+
+#~ msgid "<cmd>"
+#~ msgstr "<kommando>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "läs <fil:...> istället för standardmakrofil(er)"
+
+#~ msgid "<file:...>"
+#~ msgstr "<fil:...>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "läs <fil:...> istället för standard rpmrc-fil(er)"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Användning: %s {--help}\n"
+
+#~ msgid "The --rcfile option has been eliminated.\n"
+#~ msgstr "Flaggan --rcfile har tagits bort.\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Använd \"--macros <fil:...>\" istället.\n"
+
+#~ 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"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr "frĺga/verifiera en paketfil (t.ex. en binär *.rpm-fil)"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "visa en utförlig fillistning"
+
+#~ msgid "don't verify package digest"
+#~ msgstr "verifiera inte paketkontrollsummor"
+
+#~ msgid "don't verify package signature"
+#~ msgstr "verifiera inte paketsignatur"
diff --git a/po/tr.po b/po/tr.po
index cb3e4f654..9f0c9b409 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -75,257 +75,165 @@ msgstr "paketten baţlýk okunmasý sýrasýnda hata oluţtu\n"
 msgid "cannot re-open payload: %s\n"
 msgstr "payload %s tekrar açýlamýyor\n"
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr "Kullanýlan RPM sürümünü verir"
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr "daha az ayrýntýlý çýktý sađlar"
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr "daha ayrýntýlý çýktý sađlar"
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-#, fuzzy
-msgid "print macro expansion of EXPR"
-msgstr "<ifade>+ için makro açýlýmýný gösterir"
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr "standart çýktýyý <KOMUT>'a gönderir"
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr "<kmt>"
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr "<dizin>"
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur"
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr "<dosya:...>"
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr "öntanýmlý rpmrc dosyasý yerine <dosya:...> okunur"
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir"
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr "libio(3) API kullanýmýný iptal eder"
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr "protokol veri akýţýnda hata kontrolu"
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr "rpmio G/Ç hata kontrolu"
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr "URL arabellek kullanýmý hata kontrolu"
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr "Sorgulama seçenekleri (-q ya da --query ile)"
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr "Denetleme seçenekleri (-V ya da --verify ile)"
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr "Ýmza seçenekleri:"
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr "Veritabaný seçenekleri:"
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 "[ <specDosyasý> | <tarPaketi> | <kaynakPaketi> ] ile paketleme seçenekleri:"
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr "Kurma/Güncelleme/Kaldýrma seçenekleri:"
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr "Tüm rpm kipleri için ortak seçenekler:"
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Sürüm %s\n"
 
-#: rpmqv.c:237
+#: rpmqv.c:142
 #, fuzzy
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr "Copyright (C) 1998 - 2000 - Red Hat, Inc."
 
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
+#: rpmqv.c:143
+#, fuzzy
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr "Bu program GNU GPL koţullarýna uygun olarak serbestçe dađýtýlabilir."
 
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr "Kullanýmý: %s {--help}\n"
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
-msgstr "--rcfile seçeneđi kaldýrýlmýţtý.\n"
-
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
-msgstr "Yerine \"--macros <dosya:...>\" kullanýn.\n"
-
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "(%d) argümaný iţlenirken iç hata oluţtu :-(\n"
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip belirtilebilir"
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama/denetleme yapýlabilir"
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama bayraklarý"
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama biçemi"
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kaynađý"
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr "--dbpath bir veritabaný kullanmayan iţlemler için verilmiţ"
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "sadece  kaynak ve spec silme iţlemleri, kurma, güncelleme iţlemleri için "
 "zorlanabilir"
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 "dosyalar sadece paket kurulumu sýrasýnda yeni yerlerine yerleţtirilebilir"
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanýlabilir"
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate ve --excludepath sadece yeni paket kurulumunda kullanýlabilir"
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin kurulmasý sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ile belirtilenler '/' ile baţlamalý"
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ve --includedocs bir arada kullanýlamaz"
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket kurulumu sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb sadece paket kurulumu ve kaldýrýlmasý sýrasýnda kullanýlabilir"
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
@@ -333,7 +241,7 @@ msgstr ""
 "betik iptal etme seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
 "kullanýlabilir"
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
@@ -341,7 +249,7 @@ msgstr ""
 "tetikleme iptal seçenekleri sadece paketin kurulmasý ve silinmesi sýrasýnda "
 "kullanýlabilir"
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -349,7 +257,7 @@ msgstr ""
 "--nodeps sadece paket oluţturma, yeniden oluţturma, yeniden derleme, "
 "kurulum, kaldýrma ve denetleme iţlemlerinde kullanýlabilir"
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -357,7 +265,7 @@ msgstr ""
 "--test sadece paket kurulumu, kaldýrýlmasý ve oluţturulmasý iţlemlerinde "
 "kullanýlabilir"
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -365,82 +273,82 @@ msgstr ""
 "--root (-r) sadece kurulum, kaldýrma, sorgulama ve yeniden veritabaný "
 "oluţturma iţlemlerinde kullanýlabilir"
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ile verilenler '/' ile baţlamalý"
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr "imzalanacak dosya yok\n"
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "%s dosyasý bulunamýyor\n"
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr "pgp bulunamadý: "
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr "Anahtar parolasýný girin: "
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr "Anahtar parolasý kontrolü baţarýsýz\n"
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr "Anahtar parolasý dođru.\n"
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Makro dosyasýndaki %%_signature spec geçersiz.\n"
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr "--sign sadece paket oluţturulurken kullanýlabilir"
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr "icra baţarýsýz\n"
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr "yeniden oluţturmak için paket dosyalarý belirtilmemiţ"
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr "oluţturma için gerekli spec dosyasý belirtilmemiţ"
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr "oluţturma için gereken tar dosyalarý belirtilmemiţ"
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 #, fuzzy
 msgid "no packages given for erase"
 msgstr "yüklenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr "yüklenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr "denetleme için hiç argüman belirtilmedi"
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ile beklenmeyen girdiler"
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 #, fuzzy
 msgid "no arguments given"
 msgstr "sorgulama için hiç argüman belirtilmedi"
@@ -1232,7 +1140,7 @@ msgstr "Kurgulamak için uyumlu mimari yok\n"
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %%description içermiyor: %s\n"
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr "buildroot zaten belirtilmiţ, %s yoksayýlýyor\n"
@@ -1677,17 +1585,107 @@ msgstr "%s: readLead baţarýsýz\n"
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread baţarýsýz: %s\n"
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+#, fuzzy
+msgid "print macro expansion of EXPR"
+msgstr "<ifade>+ için makro açýlýmýný gösterir"
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 #, fuzzy
 msgid "read <FILE:...> instead of default file(s)"
 msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur"
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+#, fuzzy
+msgid "don't verify package digest(s)"
+msgstr "paket bađýmlýlýklarý dođrulanmaz"
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+#, fuzzy
+msgid "don't verify database header(s) when retrieved"
+msgstr "paket mimarisi denetlenmez"
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr "libio(3) API kullanýmýný iptal eder"
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+#, fuzzy
+msgid "don't verify package signature(s)"
+msgstr "paket imzasýný denetler"
+
+#: lib/poptALL.c:174
+#, fuzzy
+msgid "send stdout to CMD"
+msgstr "standart çýktýyý <KOMUT>'a gönderir"
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+#, fuzzy
+msgid "use ROOT as top level directory"
+msgstr "Üst düzey dizin olarak <dizin> kullanýlýr"
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr "son rpmrc ve makro yapýlandýrmasýný gösterir"
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr "daha az ayrýntýlý çýktý sađlar"
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr "daha ayrýntýlý çýktý sađlar"
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr "Kullanýlan RPM sürümünü verir"
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr "protokol veri akýţýnda hata kontrolu"
+
+#: lib/poptALL.c:208
+#, fuzzy
+msgid "debug option/argument processing"
+msgstr "(%d) argümaný iţlenirken iç hata oluţtu :-(\n"
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr "rpmio G/Ç hata kontrolu"
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr "URL arabellek kullanýmý hata kontrolu"
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1708,20 +1706,20 @@ msgstr "yeniden konumlandýrma iţlemleri = içermelidir"
 msgid "relocations must have a / following the ="
 msgstr "yeniden konumlandýrma için = den sonra bir / gerekir"
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 #, fuzzy
 msgid "malformed rollback time/date stamp argument"
 msgstr "tekrarlama zamaný bozuk"
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "yapýlandýrmalarda atlanmýţ bile olsa tüm dosyalarý kurar"
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -1729,153 +1727,142 @@ msgstr ""
 "<paket> ile eţlenen tüm paketleri kaldýrýr(<paket> ile çok sayýda paket "
 "belirtilmiţse normalde bir hata oluţur)"
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr "paket betikleri çalýţtýrýlmaz"
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr "yeniden konumlanamayan paketin dosyalarýný yeniden konumlandýrýr"
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 "ismi deđiţtirilerek alt dizine kaydedilmek suretiyle silinen dosyalarý "
 "kaydeder"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr "paketi kaldýrýr"
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr "<paket>+"
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr "belgeleri kurmaz"
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr "<dosyayolu> ile baţlayan dosyalarý atlar "
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr "<dosyaYolu>"
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs --replacefiles için kýsaltma"
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr "paket(ler) kurulu ise paket(ler)i günceller"
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr "<paketDosyasý>+"
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr "paketin kurulma sürecini gösteren imler basar (-v ile)"
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr "paket mimarisi denetlenmez"
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr "paketin ait olduđu iţletim sistemini dođrulamaz"
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr "yüklemeden önce yeterli disk alaný kontrolu yapmaz"
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr "paket ile gelen belgeleri kurar"
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 #, fuzzy
 msgid "install package(s)"
 msgstr "paketi kurar"
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr "veri tabanýný günceller, ama dosya sistemini deđiţtirmez"
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr "paket bađýmlýlýklarýný denetlemez"
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr "dosyalarýn MD5 özümlemesi dođrulanmaz"
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "paket kurulum sýrasýný bađýmlýlýklara göre düzenlemez"
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr "%%pre betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr "%%post betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr "%%preun betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr "%%postun betiđi (varsa) çalýţtýrýlmaz"
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-#, fuzzy
-msgid "don't verify package digest(s)"
-msgstr "paket bađýmlýlýklarý dođrulanmaz"
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-#, fuzzy
-msgid "don't verify database header(s) when retrieved"
-msgstr "paket mimarisi denetlenmez"
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-#, fuzzy
-msgid "don't verify package signature(s)"
-msgstr "paket imzasýný denetler"
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr "bu paket tarafýndan tetiklenen hiç bir betik çalýţtýrýlmaz"
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr "hiçbir %%triggerprein betiđi çalýţtýrýlmaz"
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr "hiçbir %%triggerin betiđi çalýţtýrýlmaz."
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr "hiçbir %%triggerun betiđi çalýţtýrýlmaz."
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr "hiçbir %%triggerpostun betiđi çalýţtýrýlmaz."
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -1883,49 +1870,53 @@ msgstr ""
 "paketin eski bir sürüme güncellenmesini sađlar (--force ayný iţi otomatik "
 "yapar)"
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr "kurulumun geliţimi yüzde olarak gösterilir"
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "eđer deđitirilebiliyorsa paketin yerini <dizin>'e deđiţtirir"
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr "<dizin>"
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr "dosyalarý <eski> dizininden kaldýrýp <yeni> dizinine yerleţtirir"
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr "<eski>=<yeni>"
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr "yeniden paketleme sýrasýnda silinen paket dosyalarýný kaydeder"
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr "paket dosyalarý mevcut dosyalarla yer deđiţtirse bile paketi kurar"
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr "paketi yeniden kurar"
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 #, fuzzy
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 "yeni paket(ler) kaldýrýlýr, geriye dönük eski paket(ler) yeniden kurulur"
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr "<tarih>"
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr "yükleme yapmaz, sadece çalýţýp çalýţmayacađýný belirtir"
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr "paket günceller"
 
@@ -1957,10 +1948,9 @@ msgid "query/verify package(s) with header identifier"
 msgstr "dosyayý içeren paketleri sorgular/denetler"
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
-msgstr ""
-"bir paket dosyasýný sorgular/denetler (örn. bir çalýţtýrýlabilir *.rpm "
-"dosyasý)"
+#, fuzzy
+msgid "query/verify a package file"
+msgstr "tüm paketleri sorgular/dođrular"
 
 #: lib/poptQV.c:109
 #, fuzzy
@@ -2009,124 +1999,116 @@ msgstr "bir bađýmlýlýk gerektiren paketleri sorgular/denetler"
 msgid "query/verify the package(s) which provide a dependency"
 msgstr "bir bađýmlýlýđý sađlayan  paketleri sorgular/denetler"
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr "tüm yapýlandýrma dosyalarýný listeler"
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr "tüm belgeleme dosyalarýný gösterir"
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr "temel dosya bilgilerini gösterir"
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr "paketteki dosyalarý gösterir"
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr "%%ghost dosyalarý atlanýr"
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr "%%license dosyalarý atlanýr"
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr "%%readme dosyalarý atlanýr"
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr "izleyen sorgulama biçimini kullanýr"
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr "spec dosyasýndaki i18n bölümleri yerine kullanýlýr"
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr "listelenmiţ dosyalarýn durumunu gösterir"
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr "ayrýntýlý dosya listesi gösterir"
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr "dosyalarýn MD5 özümlemesi dođrulanmaz"
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr "dosyalarýn uzunluklarý dođrulanmaz"
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr "dosyalarýn sembolik bađ dosya yollarý dođrulanmaz"
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr "dosyalarýn sahipleri dođrulanmaz"
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr "dosyalarýn gruplarý dođrulanmaz"
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr "dosyalarýn deđiţiklik zamanlarý dođrulanmaz"
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr "dosyalarýn kipleri dođrulanmaz"
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr "paketteki dosyalar dođrulanamaz"
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr "paket bađýmlýlýklarý dođrulanmaz"
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 #, fuzzy
 msgid "don't execute verify script(s)"
 msgstr "(varsa) %verifyscript çalýţtýrýlmaz"
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "Baţlýk SHA1 özümlemesi dođrulanmaz"
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "dosyalarýn MD5 özümlemesi dođrulanmaz"
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 #, fuzzy
 msgid "sign package(s) (identical to --resign)"
 msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "paket imzasýný denetler"
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 #, fuzzy
 msgid "sign package(s) (identical to --addsign)"
 msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr "imza üretir"
 
@@ -2469,36 +2451,36 @@ msgstr "  %s    A %s\tB %s\n"
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici deđil: %s\n"
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr "========== yeniden konumlama\n"
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d %s'i dýţlýyor\n"
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n"
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "multilib dosya yolu dýţlanýyor %s%s\n"
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s dýţlanýyor\n"
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s %s'e konumlanýyor\n"
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizini %s de yeniden konumlanýyor\n"
@@ -2955,13 +2937,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Ýmza: boyut(%d)+iz(%d)\n"
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamasýndan dolayý %s atlandý\n"
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini dýţlanýyor\n"
@@ -2974,7 +2956,7 @@ msgstr "%s dizini dýţlanýyor\n"
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2987,7 +2969,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2995,21 +2977,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3586,64 +3568,54 @@ msgstr "%s oluţturulamadý: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "paket imzasýný denetler"
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-#, fuzzy
-msgid "don't verify package digest"
-msgstr "paket bađýmlýlýklarý dođrulanmaz"
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-#, fuzzy
-msgid "don't verify package signature"
-msgstr "paket imzasýný denetler"
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 #, fuzzy
 msgid "don't change directories"
 msgstr "%s dizini oluţturuluyor\n"
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 #, fuzzy
 msgid "Common options for all rpm modes and executables:"
 msgstr "Tüm rpm kipleri için ortak seçenekler:"
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, fuzzy, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr "%s: açýlamadý: %s\n"
@@ -3653,6 +3625,46 @@ msgstr "%s: açýlamadý: %s\n"
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma baţarýsýz: %s\n"
 
+#~ msgid "<cmd>"
+#~ msgstr "<kmt>"
+
+#~ msgid "read <file:...> instead of default macro file(s)"
+#~ msgstr "öntanýmlý makro dosyasý yerine <dosya:...> okunur"
+
+#~ msgid "<file:...>"
+#~ msgstr "<dosya:...>"
+
+#~ msgid "read <file:...> instead of default rpmrc file(s)"
+#~ msgstr "öntanýmlý rpmrc dosyasý yerine <dosya:...> okunur"
+
+#~ msgid "Usage: %s {--help}\n"
+#~ msgstr "Kullanýmý: %s {--help}\n"
+
+#~ msgid "The --rcfile option has been eliminated.\n"
+#~ msgstr "--rcfile seçeneđi kaldýrýlmýţtý.\n"
+
+#~ msgid "Use \"--macros <file:...>\" instead.\n"
+#~ msgstr "Yerine \"--macros <dosya:...>\" kullanýn.\n"
+
+#~ msgid "--dbpath given for operation that does not use a database"
+#~ msgstr "--dbpath bir veritabaný kullanmayan iţlemler için verilmiţ"
+
+#~ msgid "query/verify a package file (i.e. a binary *.rpm file)"
+#~ msgstr ""
+#~ "bir paket dosyasýný sorgular/denetler (örn. bir çalýţtýrýlabilir *.rpm "
+#~ "dosyasý)"
+
+#~ msgid "display a verbose file listing"
+#~ msgstr "ayrýntýlý dosya listesi gösterir"
+
+#, fuzzy
+#~ msgid "don't verify package digest"
+#~ msgstr "paket bađýmlýlýklarý dođrulanmaz"
+
+#, fuzzy
+#~ msgid "don't verify package signature"
+#~ msgstr "paket imzasýný denetler"
+
 #~ msgid "define macro <name> with value <body>"
 #~ msgstr "<isim> makrosunu <gövde> deđeriyle tanýmlar"
 
diff --git a/po/uk.po b/po/uk.po
index 2e703444e..52cd36dab 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 2e703444e..52cd36dab 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 2e703444e..52cd36dab 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 2e703444e..52cd36dab 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.3\n"
-"POT-Creation-Date: 2002-07-25 18:54-0400\n"
+"POT-Creation-Date: 2002-07-27 20:39-0400\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"
@@ -78,353 +78,261 @@ msgstr ""
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:114 lib/poptALL.c:142
-msgid "print the version of rpm being used"
-msgstr ""
-
-#: rpmqv.c:117 lib/poptALL.c:138
-msgid "provide less detailed output"
-msgstr ""
-
-#: rpmqv.c:119 lib/poptALL.c:140
-msgid "provide more detailed output"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:145
-msgid "define MACRO with value EXPR"
-msgstr ""
-
-#: rpmqv.c:121 lib/poptALL.c:146
-msgid "'MACRO EXPR'"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:148
-msgid "print macro expansion of EXPR"
-msgstr ""
-
-#: rpmqv.c:123 lib/poptALL.c:149
-msgid "'EXPR'"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:151
-msgid "send stdout to <cmd>"
-msgstr ""
-
-#: rpmqv.c:125 lib/poptALL.c:152
-msgid "<cmd>"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:154
-msgid "use <dir> as the top level directory"
-msgstr ""
-
-#: rpmqv.c:127 lib/poptALL.c:155 lib/poptI.c:222
-msgid "<dir>"
-msgstr ""
-
-#: rpmqv.c:129
-msgid "read <file:...> instead of default macro file(s)"
-msgstr ""
-
-#: rpmqv.c:130 rpmqv.c:134 rpmqv.c:138
-msgid "<file:...>"
-msgstr ""
-
-#: rpmqv.c:133 rpmqv.c:137
-msgid "read <file:...> instead of default rpmrc file(s)"
-msgstr ""
-
-#: rpmqv.c:141 lib/poptALL.c:169
-msgid "display final rpmrc and macro configuration"
-msgstr ""
-
-#: rpmqv.c:146 lib/poptALL.c:174
-msgid "disable use of libio(3) API"
-msgstr ""
-
-#: rpmqv.c:149 lib/poptALL.c:178
-msgid "debug protocol data stream"
-msgstr ""
-
-#: rpmqv.c:151 lib/poptALL.c:180
-msgid "debug rpmio I/O"
-msgstr ""
-
-#: rpmqv.c:153 lib/poptALL.c:182
-msgid "debug URL cache handling"
-msgstr ""
-
-#: rpmqv.c:173
+#: rpmqv.c:78
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:176
+#: rpmqv.c:81
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:182
+#: rpmqv.c:87
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:188
+#: rpmqv.c:93
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:194
+#: rpmqv.c:99
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:200
+#: rpmqv.c:105
 msgid "Install/Upgrade/Erase options:"
 msgstr ""
 
-#: rpmqv.c:205
+#: rpmqv.c:110
 msgid "Common options for all rpm modes:"
 msgstr ""
 
 #. @-modfilesys -globs @
-#: rpmqv.c:222 lib/poptI.c:27
+#: rpmqv.c:127 lib/poptI.c:27
 #, c-format
 msgid "%s: %s\n"
 msgstr ""
 
-#: rpmqv.c:230 lib/poptALL.c:46
+#: rpmqv.c:135 lib/poptALL.c:54
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpmqv.c:237
-msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
-msgstr ""
-
-#: rpmqv.c:238
-msgid "This program may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-
-#: rpmqv.c:250
-#, c-format
-msgid "Usage: %s {--help}\n"
-msgstr ""
-
-#: rpmqv.c:610
-msgid "The --rcfile option has been eliminated.\n"
+#: rpmqv.c:142
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc.\n"
 msgstr ""
 
-#: rpmqv.c:611
-msgid "Use \"--macros <file:...>\" instead.\n"
+#: rpmqv.c:143
+msgid ""
+"This program may be freely redistributed under the terms of the GNU GPL\n"
 msgstr ""
 
-#: rpmqv.c:617
+#: rpmqv.c:309
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
+#: rpmqv.c:347 rpmqv.c:353 rpmqv.c:359 rpmqv.c:397
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:687
+#: rpmqv.c:376
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:691
+#: rpmqv.c:380
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:694
+#: rpmqv.c:383
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:697
+#: rpmqv.c:386
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:738
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpmqv.c:744
+#: rpmqv.c:428
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:746
+#: rpmqv.c:430
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:749
+#: rpmqv.c:433
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:752
+#: rpmqv.c:436
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:755
+#: rpmqv.c:439
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:758
+#: rpmqv.c:442
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:761
+#: rpmqv.c:445
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:449
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:770
+#: rpmqv.c:454
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:774
+#: rpmqv.c:458
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:778
+#: rpmqv.c:462
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:782
+#: rpmqv.c:466
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:786
+#: rpmqv.c:470
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:790
+#: rpmqv.c:474
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:478
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:799
+#: rpmqv.c:483
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:803
+#: rpmqv.c:487
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:491
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:496
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:501
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:822
+#: rpmqv.c:506
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:510
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:515
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:836
+#: rpmqv.c:520
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:848
+#: rpmqv.c:532
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:556
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:877
+#: rpmqv.c:561
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:580
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:901
+#: rpmqv.c:585
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:903
+#: rpmqv.c:587
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:591
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:912
+#: rpmqv.c:596
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:919
+#: rpmqv.c:603
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:936
+#: rpmqv.c:620
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:971
+#: rpmqv.c:655
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1039
+#: rpmqv.c:723
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1041
+#: rpmqv.c:725
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1063
+#: rpmqv.c:747
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1104
+#: rpmqv.c:787
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:803
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1133
+#: rpmqv.c:816
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1141
+#: rpmqv.c:824
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1157
+#: rpmqv.c:840
 msgid "no arguments given"
 msgstr ""
 
@@ -1206,7 +1114,7 @@ msgstr ""
 msgid "Package has no %%description: %s\n"
 msgstr ""
 
-#: build/poptBT.c:117
+#: build/poptBT.c:108
 #, c-format
 msgid "buildroot already specified, ignoring %s\n"
 msgstr ""
@@ -1624,16 +1532,99 @@ msgstr ""
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/poptALL.c:157 lib/poptALL.c:161 lib/poptALL.c:165
+#: lib/poptALL.c:153
+msgid "define MACRO with value EXPR"
+msgstr ""
+
+#: lib/poptALL.c:154
+msgid "'MACRO EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:156
+msgid "print macro expansion of EXPR"
+msgstr ""
+
+#: lib/poptALL.c:157
+msgid "'EXPR'"
+msgstr ""
+
+#: lib/poptALL.c:159 lib/poptALL.c:178 lib/poptALL.c:182
 msgid "read <FILE:...> instead of default file(s)"
 msgstr ""
 
-#: lib/poptALL.c:158 lib/poptALL.c:162 lib/poptALL.c:166
+#: lib/poptALL.c:160 lib/poptALL.c:179 lib/poptALL.c:183
 msgid "<FILE:...>"
 msgstr ""
 
+#: lib/poptALL.c:163 lib/poptI.c:245 lib/poptI.c:252 lib/poptQV.c:320
+#: lib/poptQV.c:329 lib/poptQV.c:368
+msgid "don't verify package digest(s)"
+msgstr ""
+
+#: lib/poptALL.c:165 lib/poptI.c:247 lib/poptI.c:254 lib/poptQV.c:323
+#: lib/poptQV.c:331 lib/poptQV.c:371
+msgid "don't verify database header(s) when retrieved"
+msgstr ""
+
+#: lib/poptALL.c:168 lib/poptALL.c:201
+msgid "disable use of libio(3) API"
+msgstr ""
+
+#: lib/poptALL.c:171 lib/poptI.c:249 lib/poptI.c:256 lib/poptQV.c:326
+#: lib/poptQV.c:333 lib/poptQV.c:373
+msgid "don't verify package signature(s)"
+msgstr ""
+
+#: lib/poptALL.c:174
+msgid "send stdout to CMD"
+msgstr ""
+
+#: lib/poptALL.c:175
+msgid "CMD"
+msgstr ""
+
+#: lib/poptALL.c:186
+msgid "use ROOT as top level directory"
+msgstr ""
+
+#: lib/poptALL.c:187
+msgid "ROOT"
+msgstr ""
+
+#: lib/poptALL.c:190
+msgid "display final rpmrc and macro configuration"
+msgstr ""
+
+#: lib/poptALL.c:193
+msgid "provide less detailed output"
+msgstr ""
+
+#: lib/poptALL.c:195
+msgid "provide more detailed output"
+msgstr ""
+
+#: lib/poptALL.c:197
+msgid "print the version of rpm being used"
+msgstr ""
+
+#: lib/poptALL.c:205
+msgid "debug protocol data stream"
+msgstr ""
+
+#: lib/poptALL.c:208
+msgid "debug option/argument processing"
+msgstr ""
+
+#: lib/poptALL.c:211
+msgid "debug rpmio I/O"
+msgstr ""
+
+#: lib/poptALL.c:213
+msgid "debug URL cache handling"
+msgstr ""
+
 #. @-nullpass@
-#: lib/poptALL.c:253
+#: lib/poptALL.c:284
 #, c-format
 msgid "%s: option table misconfigured (%d)\n"
 msgstr ""
@@ -1654,211 +1645,207 @@ msgstr ""
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:84
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:91
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:111
+#: lib/poptI.c:145
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:115
+#: lib/poptI.c:149
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:121 lib/poptI.c:176
+#: lib/poptI.c:155 lib/poptI.c:225 lib/poptI.c:228
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:125
+#: lib/poptI.c:159
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:128
+#: lib/poptI.c:162
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:131
+#: lib/poptI.c:165
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:168
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:136
+#: lib/poptI.c:170
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:137
+#: lib/poptI.c:171
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:140
+#: lib/poptI.c:176 lib/poptI.c:179
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:143
+#: lib/poptI.c:184
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:144 lib/poptI.c:160 lib/poptI.c:243
+#: lib/poptI.c:185 lib/poptI.c:201 lib/poptI.c:304
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:146
+#: lib/poptI.c:187
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:149
+#: lib/poptI.c:190
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:152
+#: lib/poptI.c:193
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:196
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:157
+#: lib/poptI.c:198
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:201
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:203
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:164
+#: lib/poptI.c:206 lib/poptI.c:209
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:167
+#: lib/poptI.c:212 lib/poptQV.c:266 lib/poptQV.c:269
+msgid "don't verify MD5 digest of files"
+msgstr ""
+
+#: lib/poptI.c:215
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:172
+#: lib/poptI.c:220
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:179
+#: lib/poptI.c:232
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:182
+#: lib/poptI.c:235
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:185
+#: lib/poptI.c:238
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:188
+#: lib/poptI.c:241
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:268 lib/poptQV.c:308
-msgid "don't verify package digest(s)"
-msgstr ""
-
-#: lib/poptI.c:193 lib/poptQV.c:271 lib/poptQV.c:311
-msgid "don't verify database header(s) when retrieved"
-msgstr ""
-
-#: lib/poptI.c:195 lib/poptQV.c:274 lib/poptQV.c:313
-msgid "don't verify package signature(s)"
-msgstr ""
-
-#: lib/poptI.c:199
+#: lib/poptI.c:260
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:202
+#: lib/poptI.c:263
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:205
+#: lib/poptI.c:266
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:208
+#: lib/poptI.c:269
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:272
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:276
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:219
+#: lib/poptI.c:280
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:282
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:283
+msgid "<dir>"
+msgstr ""
+
+#: lib/poptI.c:285
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:225
+#: lib/poptI.c:286
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:228
+#: lib/poptI.c:289
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:231
+#: lib/poptI.c:292
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:234
+#: lib/poptI.c:295
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:236
+#: lib/poptI.c:297
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:237
+#: lib/poptI.c:298
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:239
+#: lib/poptI.c:300
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:242
+#: lib/poptI.c:303
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -1887,7 +1874,7 @@ msgid "query/verify package(s) with header identifier"
 msgstr ""
 
 #: lib/poptQV.c:107
-msgid "query/verify a package file (i.e. a binary *.rpm file)"
+msgid "query/verify a package file"
 msgstr ""
 
 #: lib/poptQV.c:109
@@ -1934,118 +1921,110 @@ msgstr ""
 msgid "query/verify the package(s) which provide a dependency"
 msgstr ""
 
-#: lib/poptQV.c:189
+#: lib/poptQV.c:219
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:191
+#: lib/poptQV.c:221
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:193
+#: lib/poptQV.c:223
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:195
+#: lib/poptQV.c:225
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:200
+#: lib/poptQV.c:230
 #, c-format
 msgid "skip %%ghost files"
 msgstr ""
 
-#: lib/poptQV.c:204
+#: lib/poptQV.c:234
 #, c-format
 msgid "skip %%license files"
 msgstr ""
 
-#: lib/poptQV.c:207
+#: lib/poptQV.c:237
 #, c-format
 msgid "skip %%readme files"
 msgstr ""
 
-#: lib/poptQV.c:213
+#: lib/poptQV.c:243
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:215
+#: lib/poptQV.c:245
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:217
+#: lib/poptQV.c:247
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:219
-msgid "display a verbose file listing"
-msgstr ""
-
-#: lib/poptQV.c:233
-msgid "don't verify MD5 digest of files"
-msgstr ""
-
-#: lib/poptQV.c:236
+#: lib/poptQV.c:273
 msgid "don't verify size of files"
 msgstr ""
 
-#: lib/poptQV.c:239
+#: lib/poptQV.c:276
 msgid "don't verify symlink path of files"
 msgstr ""
 
-#: lib/poptQV.c:242
+#: lib/poptQV.c:279
 msgid "don't verify owner of files"
 msgstr ""
 
-#: lib/poptQV.c:245
+#: lib/poptQV.c:282
 msgid "don't verify group of files"
 msgstr ""
 
-#: lib/poptQV.c:248
+#: lib/poptQV.c:285
 msgid "don't verify modification time of files"
 msgstr ""
 
-#: lib/poptQV.c:251 lib/poptQV.c:254
+#: lib/poptQV.c:288 lib/poptQV.c:291
 msgid "don't verify mode of files"
 msgstr ""
 
-#: lib/poptQV.c:257
+#: lib/poptQV.c:294
 msgid "don't verify files in package"
 msgstr ""
 
-#: lib/poptQV.c:259 tools/rpmgraph.c:274
+#: lib/poptQV.c:297 lib/poptQV.c:300 tools/rpmgraph.c:274
 msgid "don't verify package dependencies"
 msgstr ""
 
-#: lib/poptQV.c:261 lib/poptQV.c:265
+#: lib/poptQV.c:305 lib/poptQV.c:309 lib/poptQV.c:312 lib/poptQV.c:315
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:279
+#: lib/poptQV.c:339
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:282
+#: lib/poptQV.c:342
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:297
+#: lib/poptQV.c:357
 msgid "sign package(s) (identical to --resign)"
 msgstr ""
 
-#: lib/poptQV.c:299
+#: lib/poptQV.c:359
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:301
+#: lib/poptQV.c:361
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:303
+#: lib/poptQV.c:363
 msgid "sign package(s) (identical to --addsign)"
 msgstr ""
 
-#: lib/poptQV.c:305
+#: lib/poptQV.c:365
 msgid "generate signature"
 msgstr ""
 
@@ -2382,36 +2361,36 @@ msgstr ""
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:607
+#: lib/rpmfi.c:603
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/rpmfi.c:611
+#: lib/rpmfi.c:607
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:614
+#: lib/rpmfi.c:610
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:684
+#: lib/rpmfi.c:680
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/rpmfi.c:750
+#: lib/rpmfi.c:746
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:760
+#: lib/rpmfi.c:756
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:839
+#: lib/rpmfi.c:835
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
@@ -2862,13 +2841,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:106
+#: lib/transaction.c:107
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:910
+#: lib/transaction.c:902
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2881,7 +2860,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1020
+#: lib/transaction.c:1012
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2894,7 +2873,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1101
+#: lib/transaction.c:1093
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2902,21 +2881,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1178
+#: lib/transaction.c:1165
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1344
+#: lib/transaction.c:1331
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1374
+#: lib/transaction.c:1361
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""
@@ -3490,60 +3469,52 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
-#: tools/rpmcache.c:517 tools/rpmgraph.c:278
-msgid "don't verify package digest"
-msgstr ""
-
-#: tools/rpmcache.c:519 tools/rpmgraph.c:280
-msgid "don't verify package signature"
-msgstr ""
-
-#: tools/rpmcache.c:522
+#: tools/rpmcache.c:518
 msgid "don't update cache database, only print package paths"
 msgstr ""
 
-#: tools/rpmcache.c:526
+#: tools/rpmcache.c:522
 msgid "follow command line symlinks"
 msgstr ""
 
-#: tools/rpmcache.c:529
+#: tools/rpmcache.c:525
 msgid "logical walk"
 msgstr ""
 
-#: tools/rpmcache.c:532
+#: tools/rpmcache.c:528
 msgid "don't change directories"
 msgstr ""
 
-#: tools/rpmcache.c:535
+#: tools/rpmcache.c:531
 msgid "don't get stat info"
 msgstr ""
 
-#: tools/rpmcache.c:538
+#: tools/rpmcache.c:534
 msgid "physical walk"
 msgstr ""
 
-#: tools/rpmcache.c:541
+#: tools/rpmcache.c:537
 msgid "return dot and dot-dot"
 msgstr ""
 
-#: tools/rpmcache.c:544
+#: tools/rpmcache.c:540
 msgid "don't cross devices"
 msgstr ""
 
-#: tools/rpmcache.c:547
+#: tools/rpmcache.c:543
 msgid "return whiteout information"
 msgstr ""
 
-#: tools/rpmcache.c:550 tools/rpmgraph.c:286
+#: tools/rpmcache.c:546 tools/rpmgraph.c:282
 msgid "Common options for all rpm modes and executables:"
 msgstr ""
 
-#: tools/rpmcache.c:582
+#: tools/rpmcache.c:578
 #, c-format
 msgid "%s: %%{_cache_dbpath} macro is mis-configured.\n"
 msgstr ""
 
-#: tools/rpmcache.c:614
+#: tools/rpmcache.c:618
 #, c-format
 msgid "%s: cache operation failed: ec %d.\n"
 msgstr ""
diff --git a/popt/po/cs.po b/popt/po/cs.po
index 95285b6e7..921f8c8fa 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/popt/po/da.po b/popt/po/da.po
index 8db09dd18..270c57927 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/popt/po/de.po b/popt/po/de.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/es.po b/popt/po/es.po
index 2f08e70e2..2ba0de1b2 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/eu_ES.po b/popt/po/eu_ES.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/eu_ES.po
+++ b/popt/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/fi.po b/popt/po/fi.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/fr.po b/popt/po/fr.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/gl.po b/popt/po/gl.po
index 52fb00601..1a16940b3 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index c6495bbf2..b1f0bcd0f 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/id.po b/popt/po/id.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/is.po b/popt/po/is.po
index eee26a076..7df805b6a 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/popt/po/it.po b/popt/po/it.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/ja.po b/popt/po/ja.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/ko.po b/popt/po/ko.po
index bdcb3328d..59b1eca59 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/popt/po/no.po b/popt/po/no.po
index 50473e2ec..1249d2e07 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index 1e7c60355..2d3892eb1 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/pt.po b/popt/po/pt.po
index 87c006510..59b588369 100644
--- a/popt/po/pt.po
+++ b/popt/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index 736af41fb..b9a3f067c 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.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/ro.po b/popt/po/ro.po
index f4fd8c1e5..4d130b107 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index d3e788005..bc5a7c639 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index 2690d92b3..8d7e5e947 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/sl.po b/popt/po/sl.po
index 0f972408e..eb0436577 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/sr.po b/popt/po/sr.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/sv.po b/popt/po/sv.po
index 5a6f9aed8..e6d83654b 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index 371eb50e5..694395336 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index a8b5f6223..bfcacceb5 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/wa.po b/popt/po/wa.po
index b48a4de64..cae77218e 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/zh.po b/popt/po/zh.po
index 736af41fb..b9a3f067c 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index 6522f8163..107e43358 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.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\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"
diff --git a/popt/popthelp.c b/popt/popthelp.c
index 94af48159..f40b7401c 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -101,7 +101,11 @@ getArgDescrip(const struct poptOption * opt,
 
     switch (opt->argInfo & POPT_ARG_MASK) {
     case POPT_ARG_NONE:		return POPT_("NONE");
+#ifdef	DYING
     case POPT_ARG_VAL:		return POPT_("VAL");
+#else
+    case POPT_ARG_VAL:		return NULL;
+#endif
     case POPT_ARG_INT:		return POPT_("INT");
     case POPT_ARG_LONG:		return POPT_("LONG");
     case POPT_ARG_STRING:	return POPT_("STRING");
@@ -600,16 +604,29 @@ static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
 }
 
 /**
+ * Keep track of option tables already processed.
+ */
+typedef struct poptDone_s {
+    int nopts;
+    int maxopts;
+/*@observer@*/
+    const void ** opts;
+} * poptDone;
+
+/**
  * Display usage text for a table of options.
  * @param con		context
  * @param fp		output file handle
  * @param cursor
  * @param opt		option(s)
  * @param translation_domain	translation domain
+ * @param done		tables already processed
+ * @return
  */
 static int singleTableUsage(poptContext con, FILE * fp,
 		int cursor, const struct poptOption * opt,
-		/*@null@*/ const char * translation_domain)
+		/*@null@*/ const char * translation_domain,
+		poptDone done)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
@@ -619,9 +636,21 @@ static int singleTableUsage(poptContext con, FILE * fp,
         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) {
-	    if (opt->arg)	/* XXX program error */
+	    int i = 0;
+	    if (done)
+	    for (i = 0; i < done->nopts; i++) {
+		const void * that = done->opts[i];
+		if (that == NULL || that != opt->arg)
+		    continue;
+		break;
+	    }
+	    /* Skip if this table has already been processed. */
+	    if (opt->arg == NULL || i < done->nopts)
+		continue;
+	    if (done->nopts < done->maxopts)
+		done->opts[done->nopts++] = (const void *) opt->arg;
 	    cursor = singleTableUsage(con, fp, cursor, opt->arg,
-			translation_domain);
+			translation_domain, done);
 	} else if ((opt->longName || opt->shortName) &&
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
@@ -634,6 +663,7 @@ static int singleTableUsage(poptContext con, FILE * fp,
 
 /**
  * Return concatenated short options for display.
+ * @todo Sub-tables should be recursed.
  * @param opt		option(s)
  * @param fp		output file handle
  * @retval str		concatenation of short options
@@ -674,13 +704,20 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
 
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
+    poptDone done = memset(alloca(sizeof(*done)), 0, sizeof(*done));
     int cursor;
 
+    done->nopts = 0;
+    done->maxopts = 64;
+    cursor = done->maxopts * sizeof(*done->opts);
+    done->opts = memset(alloca(cursor), 0, cursor);
+    done->opts[done->nopts++] = (const void *) con->options;
+
     cursor = showHelpIntro(con, fp);
     cursor += showShortOptions(con->options, fp, NULL);
-    (void) singleTableUsage(con, fp, cursor, con->options, NULL);
-    (void) itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
-    (void) itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
+    cursor = singleTableUsage(con, fp, cursor, con->options, NULL, done);
+    cursor = itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
+    cursor = itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
 
     if (con->otherHelp) {
 	cursor += strlen(con->otherHelp) + 1;
diff --git a/rpm.spec.in b/rpm.spec.in
index b1580582c..3b0d44b66 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.57
+Release: 0.58
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -26,6 +26,7 @@ Conflicts: patch < 2.5
 Prereq: gawk fileutils textutils mktemp shadow-utils
 %endif
 Requires: popt = 1.7
+Obsoletes: rpm-perl < %{version}
 
 %if !%{with_internal_db}
 BuildRequires: db3-devel
@@ -514,6 +515,10 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Sat Jul 27 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.58
+- popt: display sub-table options only once on --usage.
+- wire --nosignatures et al as common options, rework CLI options.
+
 * Thu Jul 25 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.57
 - python: remove the old initdb/rebuilddb methods, use ts.fooDB().
 - python: 1st crack at backport to 1.5.2.
diff --git a/rpmqv.c b/rpmqv.c
index bfa078f44..4dcd5be25 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -17,11 +17,6 @@
 #include "rpmps.h"
 #include "rpmts.h"
 
-#define	POPT_NODEPS		1025
-#define	POPT_FORCE		1026
-#define	POPT_NOMD5		1027
-#define	POPT_NOSCRIPTS		1028
-
 #ifdef	IAM_RPMBT
 #include "build.h"
 #define GETOPT_REBUILD		1003
@@ -34,13 +29,6 @@
 
 #include "debug.h"
 
-#define GETOPT_SHOWRC		1018
-#define	GETOPT_DEFINEMACRO	1020
-#define	GETOPT_EVALMACRO	1021
-#ifdef	NOTYET
-#define	GETOPT_RCFILE		1022
-#endif
-
 enum modes {
 
     MODE_QUERY		= (1 <<  0),
@@ -76,96 +64,13 @@ enum modes {
 #define	MODES_FOR_TEST		(MODES_BT | MODES_IE)
 #define	MODES_FOR_ROOT		(MODES_BT | MODES_IE | MODES_QV | MODES_DB | MODES_K)
 
-/*@-exportheadervar@*/
-/*@unchecked@*/
-extern int _ftp_debug;
-/*@unchecked@*/
-extern int noLibio;
-/*@unchecked@*/
-extern int _rpmio_debug;
-
-/*@=exportheadervar@*/
-
-/* options for all executables */
-
-/*@unchecked@*/
-static int help = 0;
-/*@unchecked@*/
-static int noUsageMsg = 0;
-/*@unchecked@*/
-/*@observer@*/ /*@null@*/
-static const char * pipeOutput = NULL;
-/*@unchecked@*/
-static int quiet = 0;
-/*@unchecked@*/
-/*@observer@*/ /*@null@*/
-static const char * rcfile = NULL;
-/*@unchecked@*/
-/*@observer@*/ /*@null@*/
-static char * rootdir = "/";
-/*@unchecked@*/
-static int showrc = 0;
-/*@unchecked@*/
-static int showVersion = 0;
-
-/*@unchecked@*/
-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, 0, GETOPT_DEFINEMACRO,
-	N_("define MACRO with value EXPR"), N_("'MACRO EXPR'") },
- { "eval", '\0', POPT_ARG_STRING, 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 | POPT_ARGFLAG_SHOW_DEFAULT, &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:...>") },
-#if !defined(GETOPT_RCFILE)
- { "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,	
-	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 },
-
-#if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
- { "nolibio", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &noLibio, 1,
-	N_("disable use of libio(3) API"), NULL},
-#endif
- { "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
-};
-
 /* the structure describing the options we take and the defaults */
 /*@unchecked@*/
 static struct poptOption optionsTable[] = {
 
  /* XXX colliding options */
-#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
  {  NULL, 'i', POPT_ARGFLAG_DOC_HIDDEN, 0, 'i',			NULL, NULL},
- {  "nodeps", 0, POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_NODEPS,	NULL, NULL},
- {  "noscripts", 0, POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_NOSCRIPTS,	NULL, NULL},
- {  "nomd5", 0, POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_NOMD5,		NULL, NULL},
- {  "force", 0, POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_FORCE,		NULL, NULL},
 #endif
 
 #ifdef	IAM_RPMQV
@@ -201,7 +106,7 @@ static struct poptOption optionsTable[] = {
 	NULL },
 #endif	/* IAM_RPMEIU */
 
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmAllPoptTable, 0,
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
 	N_("Common options for all rpm modes:"),
 	NULL },
 
@@ -223,60 +128,33 @@ long _stksize = 64 * 1024L;
     exit(EXIT_FAILURE);
 }
 
-static void printVersion(void)
+static void printVersion(FILE * fp)
 	/*@globals rpmEVR, fileSystem @*/
 	/*@modifies fileSystem @*/
 {
-    fprintf(stdout, _("RPM version %s\n"), rpmEVR);
+    fprintf(fp, _("RPM version %s\n"), rpmEVR);
 }
 
-static void printBanner(void)
+static void printBanner(FILE * fp)
 	/*@globals fileSystem @*/
 	/*@modifies fileSystem @*/
 {
-    (void) puts(_("Copyright (C) 1998-2002 - Red Hat, Inc."));
-    (void) puts(_("This program may be freely redistributed under the terms of the GNU GPL"));
+    fprintf(fp, _("Copyright (C) 1998-2002 - Red Hat, Inc.\n"));
+    fprintf(fp, _("This program may be freely redistributed under the terms of the GNU GPL\n"));
 }
 
-static void printUsage(void)
+static void printUsage(poptContext con, FILE * fp, int flags)
 	/*@globals __assert_program_name, rpmEVR, fileSystem @*/
 	/*@modifies fileSystem @*/
 {
-    FILE * fp = stdout;
-    printVersion();
-    printBanner();
-    (void) puts("");
-
-    fprintf(fp, _("Usage: %s {--help}\n"), __progname);
-    fprintf(fp,   "       %s {--version}\n" , __progname);
-
-#ifdef	IAM_RPMEIU
-#ifdef	DYING
---dbpath	all
---ftpproxy etc	all
---force		alias for --replacepkgs --replacefiles
---includedocs	handle as option in table
-		--erase forbids many options
-#endif	/* DYING */
-#endif	/* IAM_RPMEIU */
-
-#ifdef	IAM_RPMQV
-#ifdef	DYING	/* XXX popt glue needing --help doco. */
---dbpath	all
---ftpproxy etc	all
--i,--info	Q
--R,--requires	Q
--P,--provides	Q
---scripts	Q
---triggeredby	Q
---changelog	Q
---triggers	Q
---querytags	!V
---setperms	V
---setugids	V
-#endif	/* DYING */
-#endif	/* IAM_RPMQV */
-
+    printVersion(fp);
+    printBanner(fp);
+    fprintf(fp, "\n");
+
+    if (rpmIsVerbose())
+	poptPrintHelp(con, fp, flags);
+    else
+	poptPrintUsage(con, fp, flags);
 }
 
 /*@-bounds@*/ /* LCL: segfault */
@@ -320,7 +198,6 @@ int main(int argc, const char ** argv)
 #endif
 
     int arg;
-    int gotDbpath = 0;
 
     const char * optArg;
     pid_t pipeChild = 0;
@@ -369,18 +246,7 @@ int main(int argc, const char ** argv)
 #endif
     /*@=nullpass@*/
 
-    /* set the defaults for the various command line options */
-    _ftp_debug = 0;
-
-#if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
-    noLibio = 0;
-#else
-    noLibio = 1;
-#endif
-    _rpmio_debug = 0;
-
     /* XXX Eliminate query linkage loop */
-    specedit = 0;
     /*@-type@*/	/* FIX: casts? */
     parseSpecVec = parseSpec;
     freeSpecVec = freeSpec;
@@ -406,146 +272,14 @@ int main(int argc, const char ** argv)
     (void) poptReadDefaultConfig(optCon, 1);
     poptSetExecPath(optCon, RPMCONFIGDIR, 1);
 
-    /* reading rcfile early makes it easy to override */
-    /* XXX only --rcfile (and --showrc) need this pre-parse */
-
-    while ((arg = poptGetNextOpt(optCon)) > 0) {
-	switch(arg) {
-	case 'v':
-	    rpmIncreaseVerbosity();	/* XXX silly use by showrc */
-	    /*@switchbreak@*/ break;
-        default:
-	    /*@switchbreak@*/ break;
-      }
-    }
-
-    if (rpmReadConfigFiles(rcfile, NULL))  
-	exit(EXIT_FAILURE);
-
-    if (showrc) {
-	(void) rpmShowRC(stdout);
-	exit(EXIT_SUCCESS);
-    }
-
-    rpmSetVerbosity(RPMMESS_NORMAL);	/* XXX silly use by showrc */
-
-    poptResetContext(optCon);
-
-#ifdef	IAM_RPMQV
-    qva->qva_queryFormat = _free(qva->qva_queryFormat);
-    memset(qva, 0, sizeof(*qva));
-    qva->qva_source = RPMQV_PACKAGE;
-    qva->qva_fflags = RPMFILE_ALL;
-    qva->qva_mode = ' ';
-    qva->qva_char = ' ';
-#endif
-
-#ifdef	IAM_RPMBT
-    ba->buildRootOverride = _free(ba->buildRootOverride);
-    ba->targets = _free(ba->targets);
-    memset(ba, 0, sizeof(*ba));
-    ba->buildMode = ' ';
-    ba->buildChar = ' ';
-#endif
-
-#ifdef	IAM_RPMDB
-    memset(da, 0, sizeof(*da));
-#endif
-
-#ifdef	IAM_RPMK
-    ka->qva_queryFormat = _free(ka->qva_queryFormat);
-    memset(ka, 0, sizeof(*ka));
-    ka->qva_source = RPMQV_PACKAGE;
-    ka->qva_fflags = RPMFILE_ALL;
-    ka->qva_mode = ' ';
-    ka->qva_char = ' ';
-#endif
-
-#ifdef	IAM_RPMEIU
-    if (ia->relocations != NULL)
-    for (i = 0; i < ia->numRelocations; i++)
-	ia->relocations[i].oldPath = _free(ia->relocations[i].oldPath);
-    ia->relocations = _free(ia->relocations);
-    memset(ia, 0, sizeof(*ia));
-    ia->transFlags = RPMTRANS_FLAG_NONE;
-    ia->probFilter = RPMPROB_FILTER_NONE;
-    ia->installInterfaceFlags = INSTALL_NONE;
-    ia->eraseInterfaceFlags = UNINSTALL_NONE;
-#endif
-
     while ((arg = poptGetNextOpt(optCon)) > 0) {
 	optArg = poptGetOptArg(optCon);
 
 	switch (arg) {
 	    
-	case 'v':
-	    rpmIncreaseVerbosity();
-	    /*@switchbreak@*/ break;
-
 /* XXX options used in multiple rpm modes */
-#if defined(IAM_RPMQV) || defined(IAM_RPMK)
-	case POPT_NOMD5:
-#ifdef	IAM_RPMQV
-	    if (bigMode == MODE_VERIFY || qva->qva_mode == 'V')
-		qva->qva_flags |= VERIFY_MD5;
-	    else
-#endif
-#ifdef	IAM_RPMK
-	    if (bigMode & MODES_K)
-		ka->qva_flags |= VERIFY_MD5;
-	    else
-#endif
-#ifdef IAM_RPMEIU
-	    if (bigMode & MODES_IE)
-		ia->transFlags |= RPMTRANS_FLAG_NOMD5;
-	    else
-#endif
-		{};
-	    /*@switchbreak@*/ break;
-#endif	/* IAM_RPMQV || IAM_RPMK */
-
-#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
-	case POPT_NODEPS:
-#ifdef	IAM_RPMQV
-	    if (bigMode == MODE_VERIFY || qva->qva_mode == 'V')
-		qva->qva_flags |= VERIFY_DEPS;
-	    else
-#endif
-#ifdef	IAM_RPMEIU
-	    if ((bigMode & MODES_IE) ||
-		(ia->installInterfaceFlags &
-	    (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL|INSTALL_ERASE)))
-		ia->noDeps = 1;
-	    else
-#endif
-#ifdef	IAM_RPMBT
-	    if ((bigMode & MODES_BT) || ba->buildMode != ' ')
-		ba->noDeps = 1;
-	    else
-#endif
-		/*@-ifempty@*/ ;
-	    /*@switchbreak@*/ break;
-
-	case POPT_FORCE:
-#ifdef	IAM_RPMEIU
-	    if ((bigMode & MODES_IE) ||
-		(ia->installInterfaceFlags &
-	    (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL|INSTALL_ERASE)))
-		ia->probFilter |=
-			( RPMPROB_FILTER_REPLACEPKG
-			| RPMPROB_FILTER_REPLACEOLDFILES
-			| RPMPROB_FILTER_REPLACENEWFILES
-			| RPMPROB_FILTER_OLDPACKAGE);
-	    else
-#endif
-#ifdef	IAM_RPMBT
-	    if ((bigMode & MODES_BT) || ba->buildMode != ' ')
-		ba->force = 1;
-	    else
-#endif
-		/*@-ifempty@*/ ;
-	    /*@switchbreak@*/ break;
 
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
 	case 'i':
 #ifdef	IAM_RPMQV
 	    if (bigMode == MODE_QUERY || qva->qva_mode == 'q') {
@@ -569,49 +303,7 @@ int main(int argc, const char ** argv)
 #endif
 		/*@-ifempty@*/ ;
 	    /*@switchbreak@*/ break;
-
-	case POPT_NOSCRIPTS:
-#ifdef	IAM_RPMQV
-	    if (bigMode == MODE_VERIFY || qva->qva_mode == 'V')
-		qva->qva_flags |= VERIFY_SCRIPT;
-	    else
-#endif
-#ifdef	IAM_RPMEIU
-	    if ((bigMode & MODES_IE) ||
-		(ia->installInterfaceFlags &
-	    (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL|INSTALL_ERASE)))
-		ia->transFlags |= (_noTransScripts | _noTransTriggers);
-	    else
-#endif
-		/*@-ifempty@*/ ;
-	    /*@switchbreak@*/ break;
-
-#endif	/* IAM_RPMQV || IAM_RPMEIU || IAM_RPMBT */
-
-	case GETOPT_DEFINEMACRO:
-	    if (optArg) {
-		(void) rpmDefineMacro(NULL, optArg, RMIL_CMDLINE);
-/*@i@*/		(void) rpmDefineMacro(rpmCLIMacroContext, optArg,RMIL_CMDLINE);
-	    }
-	    noUsageMsg = 1;
-	    /*@switchbreak@*/ break;
-
-	case GETOPT_EVALMACRO:
-	    if (optArg) {
-		const char *val = rpmExpand(optArg, NULL);
-		fprintf(stdout, "%s\n", val);
-		val = _free(val);
-	    }
-	    noUsageMsg = 1;
-	    /*@switchbreak@*/ break;
-
-#if defined(GETOPT_RCFILE)
-	case GETOPT_RCFILE:
-	    fprintf(stderr, _("The --rcfile option has been eliminated.\n"));
-	    fprintf(stderr, _("Use \"--macros <file:...>\" instead.\n"));
-	    exit(EXIT_FAILURE);
-	    /*@notreached@*/ break;
-#endif
+#endif	/* IAM_RPMQV || IAM_RPMEIU */
 
 	default:
 	    fprintf(stderr, _("Internal error in argument processing (%d) :-(\n"), arg);
@@ -619,11 +311,6 @@ int main(int argc, const char ** argv)
 	}
     }
 
-    if (quiet)
-	rpmSetVerbosity(RPMMESS_QUIET);
-
-    if (showVersion) printVersion();
-
     if (arg < -1) {
 	fprintf(stderr, "%s: %s\n", 
 		poptBadOption(optCon, POPT_BADOPTION_NOALIAS), 
@@ -631,6 +318,8 @@ int main(int argc, const char ** argv)
 	exit(EXIT_FAILURE);
     }
 
+    rpmcliConfigured();
+
 #ifdef	IAM_RPMBT
     switch (ba->buildMode) {
     case 'b':	bigMode = MODE_BUILD;		break;
@@ -733,11 +422,6 @@ int main(int argc, const char ** argv)
   }
 #endif	/* IAM_RPMK */
 
-    /* XXX TODO: never happens. */
-    if (gotDbpath && (bigMode & ~MODES_FOR_DBPATH))
-	argerror(_("--dbpath given for operation that does not use a "
-			"database"));
-
 #if defined(IAM_RPMEIU)
     if (!( bigMode == MODE_INSTALL ) &&
 (ia->probFilter & (RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES | RPMPROB_FILTER_OLDPACKAGE)))
@@ -832,19 +516,19 @@ int main(int argc, const char ** argv)
 		 "erasure, and building"));
 #endif	/* IAM_RPMEIU */
 
-    if (rootdir && rootdir[1] && (bigMode & ~MODES_FOR_ROOT))
+    if (rpmcliRootDir && rpmcliRootDir[1] && (bigMode & ~MODES_FOR_ROOT))
 	argerror(_("--root (-r) may only be specified during "
 		 "installation, erasure, querying, and "
 		 "database rebuilds"));
 
-    if (rootdir) {
-	switch (urlIsURL(rootdir)) {
+    if (rpmcliRootDir) {
+	switch (urlIsURL(rpmcliRootDir)) {
 	default:
 	    if (bigMode & MODES_FOR_ROOT)
 		break;
 	    /*@fallthrough@*/
 	case URL_IS_UNKNOWN:
-	    if (rootdir[0] != '/')
+	    if (rpmcliRootDir[0] != '/')
 		argerror(_("arguments to --root (-r) must begin with a /"));
 	    break;
 	}
@@ -925,14 +609,14 @@ int main(int argc, const char ** argv)
     /*@=branchstate@*/
 #endif	/* IAM_RPMBT || IAM_RPMK */
 
-    if (pipeOutput) {
+    if (rpmcliPipeOutput) {
 	(void) pipe(p);
 
 	if (!(pipeChild = fork())) {
 	    (void) close(p[1]);
 	    (void) dup2(p[0], STDIN_FILENO);
 	    (void) close(p[0]);
-	    (void) execl("/bin/sh", "/bin/sh", "-c", pipeOutput, NULL);
+	    (void) execl("/bin/sh", "/bin/sh", "-c", rpmcliPipeOutput, NULL);
 	    fprintf(stderr, _("exec failed\n"));
 	}
 
@@ -942,7 +626,7 @@ int main(int argc, const char ** argv)
     }
 	
     ts = rpmtsCreate();
-    (void) rpmtsSetRootDir(ts, rootdir);
+    (void) rpmtsSetRootDir(ts, rpmcliRootDir);
     switch (bigMode) {
 #ifdef	IAM_RPMDB
     case MODE_INITDB:
@@ -985,9 +669,9 @@ int main(int argc, const char ** argv)
 	    ba->cookie = NULL;
 	    ec = rpmInstallSource(ts, pkg, &specFile, &ba->cookie);
 	    if (ec == 0) {
-		ba->rootdir = rootdir;
+		ba->rootdir = rpmcliRootDir;
 		ba->passPhrase = passPhrase;
-		ec = build(ts, specFile, ba, rcfile);
+		ec = build(ts, specFile, ba, rpmcliRcfile);
 	    }
 	    ba->cookie = _free(ba->cookie);
 	    specFile = _free(specFile);
@@ -1042,14 +726,14 @@ int main(int argc, const char ** argv)
 	}
 
 	while ((pkg = poptGetArg(optCon))) {
-	    ba->rootdir = rootdir;
+	    ba->rootdir = rpmcliRootDir;
 	    ba->passPhrase = passPhrase;
 	    ba->cookie = NULL;
-	    ec = build(ts, pkg, ba, rcfile);
+	    ec = build(ts, pkg, ba, rpmcliRcfile);
 	    if (ec)
 		/*@loopbreak@*/ break;
 	    rpmFreeMacros(NULL);
-	    (void) rpmReadConfigFiles(rcfile, NULL);
+	    (void) rpmReadConfigFiles(rpmcliRcfile, NULL);
 	}
     }	break;
 #endif	/* IAM_RPMBT */
@@ -1071,7 +755,6 @@ ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
 
     case MODE_INSTALL:
 
-	/* RPMTRANS_FLAG_BUILD_PROBS */
 	/* RPMTRANS_FLAG_KEEPOBSOLETE */
 
 	if (!ia->incldocs) {
@@ -1187,7 +870,8 @@ ia->probFilter |= RPMPROB_FILTER_OLDPACKAGE;
     case MODE_ERASE:
 #endif
     case MODE_UNKNOWN:
-	if (!showVersion && !help && !noUsageMsg) printUsage();
+	if (poptPeekArg(optCon) != NULL || argc <= 1 || rpmIsVerbose())
+	    printUsage(optCon, stdout, 0);
 	break;
     }
 
diff --git a/tools/rpmcache.c b/tools/rpmcache.c
index 637ca5591..b84a98d8f 100644
--- a/tools/rpmcache.c
+++ b/tools/rpmcache.c
@@ -513,10 +513,6 @@ static int vsflags = _RPMTS_VSF_VERIFY_LEGACY;
 static struct poptOption optionsTable[] = {
  { "nolegacy", '\0', POPT_BIT_CLR,      &vsflags, _RPMTS_VSF_VERIFY_LEGACY,
 	N_("don't verify header+payload signature"), NULL },
- { "nodigest", '\0', POPT_BIT_SET,      &vsflags, _RPMTS_VSF_NODIGESTS,
-	N_("don't verify package digest"), NULL },
- { "nosignature", '\0', POPT_BIT_SET,   &vsflags, _RPMTS_VSF_NOSIGNATURES,
-	N_("don't verify package signature"), NULL },
 
  { "nocache", '\0', POPT_ARG_VAL,   &noCache, -1,
 	N_("don't update cache database, only print package paths"), NULL },
@@ -585,7 +581,15 @@ main(int argc, char *const argv[])
     }
 
     ts = rpmtsCreate();
+
+    if (rpmcliQueryFlags & VERIFY_DIGEST)
+	vsflags |= _RPMTS_VSF_NODIGESTS;
+    if (rpmcliQueryFlags & VERIFY_SIGNATURE)
+	vsflags |= _RPMTS_VSF_NOSIGNATURES;
+    if (rpmcliQueryFlags & VERIFY_HDRCHK)
+	vsflags |= _RPMTS_VSF_NOHDRCHK;
     (void) rpmtsSetVerifySigFlags(ts, vsflags);
+
     {   int_32 tid = (int_32) time(NULL);
 	(void) rpmtsSetTid(ts, tid);
     }
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index 529c4544a..601055a63 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -274,10 +274,6 @@ static struct poptOption optionsTable[] = {
 	N_("don't verify package dependencies"), NULL },
  { "nolegacy", '\0', POPT_BIT_CLR,	&vsflags, _RPMTS_VSF_VERIFY_LEGACY,
         N_("don't verify header+payload signature"), NULL },
- { "nodigest", '\0', POPT_BIT_SET,	&vsflags, _RPMTS_VSF_NODIGESTS,
-        N_("don't verify package digest"), NULL },
- { "nosignature", '\0', POPT_BIT_SET,	&vsflags, _RPMTS_VSF_NOSIGNATURES,
-        N_("don't verify package signature"), NULL },
 
  { "nochainsaw", '\0', POPT_ARGFLAG_DOC_HIDDEN, &noChainsaw, 0,
 	NULL, NULL},
@@ -304,6 +300,12 @@ main(int argc, char *const argv[])
 	exit(EXIT_FAILURE);
 
     ts = rpmtsCreate();
+    if (rpmcliQueryFlags & VERIFY_DIGEST)
+	vsflags |= _RPMTS_VSF_NODIGESTS;
+    if (rpmcliQueryFlags & VERIFY_SIGNATURE)
+	vsflags |= _RPMTS_VSF_NOSIGNATURES;
+    if (rpmcliQueryFlags & VERIFY_HDRCHK)
+	vsflags |= _RPMTS_VSF_NOHDRCHK;
     (void) rpmtsSetVerifySigFlags(ts, vsflags);
 
     ec = rpmGraph(ts, ia, poptGetArgs(optCon));