Sync with rpm-4_0 branch.

CVS patchset: 4338
CVS date: 2000/12/12 20:03:45

155 files changed, 28427 insertions, 28962 deletions

diff --git a/CHANGES b/CHANGES
index acb5dcaba..c801fcd0c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -51,6 +51,18 @@
 	- autoconfigure generating rpm API doco.
 	- fix: don't fdFree in rpmVerifyScript, rpmtransFree does already.
 	- use package version 3 if --nodirtokens is specified.
+	- add package names to problem sets early, don't save removed header.
+	- make sure that replaced tags in region are counted in headerSizeof().
+	- support for dmalloc debugging.
+	- filter region tags in headerNextIterator, exit throut headerReload.
+	- add rpmtransGetKeys() to retrieve transaction keys in tsort'ed order.
+	- python bindings for rpmtransGetKeys().
+	- fix: include alignment in count when swabbing header region.
+	- handle added dirtoken tags (mostly) correctly with header regions.
+	- add FHS doc/man/info dirs, diddle autoconf goo.
+	- fix: headerUnload handles headers w/o regions correctly on rebuilddb.
+	- resurrect rpmrc Provides: as well as implicit dependency on packge
+		info.
 
 3.0.6 -> 4.0
 	- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.
diff --git a/Makefile.am b/Makefile.am
index 3a4a9f8e3..fa44df9df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ rpmpopt-$(VERSION): rpmpopt
 	cp $< $@
 
 noinst_HEADERS = \
-	acconfig.h	build.h		system.h
+	acconfig.h	build.h		debug.h		system.h
 
 rpm_SOURCES =		rpm.c
 rpm_LDFLAGS =		@LDFLAGS_STATIC@ $(myLDFLAGS)
@@ -179,7 +179,7 @@ nextsrpm: all archive
 doxygen @WITH_APIDOCS_TARGET@: Doxyfile
 	rm -rf $@
 	mkdir -p $@
-	doxygen
+	- [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@
 
 ctags:
 	find . -type f -name "*.[ch]*" | xargs @CTAGS@
diff --git a/acconfig.h b/acconfig.h
index 5eb6a238b..cc832ec36 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -156,6 +156,9 @@
 /* Use the Berkeley db1 API from glibc? */
 #undef USE_DB0
 
+/* Build with dmalloc support? */
+#undef DMALLOC
+
 ^L
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
diff --git a/autodeps/sparc-linux.prov b/autodeps/sparc-linux.prov
index a637b874e..fa9511357 100644
--- a/autodeps/sparc-linux.prov
+++ b/autodeps/sparc-linux.prov
@@ -8,8 +8,8 @@ filelist=$(grep "\\.so" | grep -v "^/lib/ld.so" | xargs file -L 2>/dev/null | gr
 for f in $filelist; do
     soname=$(objdump -p $f | awk '/SONAME/ {print $2}')
 
+    lib64=`if file -L $f 2>/dev/null | grep "ELF 64-bit" >/dev/null; then echo "()(64bit)"; fi`
     if [ "$soname" != "" ]; then
-	lib64=`if file -L $f 2>/dev/null | grep "ELF 64-bit" >/dev/null; then echo "()(64bit)"; fi`
 	if [ ! -L $f ]; then
 	    echo $soname$lib64
 	    objdump -p $f | awk '
@@ -24,6 +24,6 @@ for f in $filelist; do
 		done
 	fi
     else
-	echo ${f##*/}
+	echo ${f##*/}$lib64
     fi
 done | sort -u
diff --git a/build.c b/build.c
index c4dc95bcc..6f6dbc13f 100644
--- a/build.c
+++ b/build.c
@@ -5,6 +5,7 @@
 
 #include "build.h"
 #include "install.h"
+#include "debug.h"
 
 static int checkSpec(Header h)
 {
@@ -23,7 +24,7 @@ static int checkSpec(Header h)
 	const char *dn;
 	dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL);
 	rpmError(RPMERR_OPEN, _("cannot open rpm database in %s\n"), dn);
-	xfree(dn);
+	free((void *)dn);
 	exit(EXIT_FAILURE);
     }
     ts = rpmtransCreateSet(db, rootdir);
@@ -128,8 +129,8 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
 			zcmds[res & 0x3], arg, tmpSpecFile);
 	if (!(fp = popen(cmd, "r"))) {
 	    rpmError(RPMERR_POPEN, _("Failed to open tar pipe: %m"));
-	    xfree(specDir);
-	    xfree(tmpSpecFile);
+	    free((void *)specDir);
+	    free((void *)tmpSpecFile);
 	    return 1;
 	}
 	if ((!fgets(buf, sizeof(buf) - 1, fp)) || !strchr(buf, '/')) {
@@ -140,16 +141,16 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
 		    zcmds[res & 0x3], arg, tmpSpecFile);
 	    if (!(fp = popen(cmd, "r"))) {
 		rpmError(RPMERR_POPEN, _("Failed to open tar pipe: %m"));
-		xfree(specDir);
-		xfree(tmpSpecFile);
+		free((void *)specDir);
+		free((void *)tmpSpecFile);
 		return 1;
 	    }
 	    if (!fgets(buf, sizeof(buf) - 1, fp)) {
 		/* Give up */
 		rpmError(RPMERR_READ, _("Failed to read spec file from %s"), arg);
 		unlink(tmpSpecFile);
-		xfree(specDir);
-		xfree(tmpSpecFile);
+		free((void *)specDir);
+		free((void *)tmpSpecFile);
 	    	return 1;
 	    }
 	}
@@ -170,16 +171,16 @@ static int buildForTarget(const char *arg, struct rpmBuildArguments *ba,
 	specURL = s = alloca(strlen(specDir) + strlen(cmd) + 5);
 	sprintf(s, "%s/%s", specDir, cmd);
 	res = rename(tmpSpecFile, s);
-	xfree(specDir);
+	free((void *)specDir);
 	
 	if (res) {
 	    rpmError(RPMERR_RENAME, _("Failed to rename %s to %s: %m"),
 			tmpSpecFile, s);
 	    unlink(tmpSpecFile);
-	    xfree(tmpSpecFile);
+	    free((void *)tmpSpecFile);
 	    return 1;
 	}
-	xfree(tmpSpecFile);
+	free((void *)tmpSpecFile);
 
 	/* Make the directory which contains the tarball the source 
 	   directory for this run */
@@ -263,11 +264,10 @@ exit:
     if (spec)
 	freeSpec(spec);
     if (buildRootURL)
-	xfree(buildRootURL);
+	free((void *)buildRootURL);
     return rc;
 }
 
-/** */
 int build(const char * arg, struct rpmBuildArguments * ba,
 	const char * passPhrase, int fromTarball, char * cookie,
 	const char * rcfile, int force, int nodeps)
diff --git a/build/build.c b/build/build.c
index cbe59db07..cda5f67ad 100644
--- a/build/build.c
+++ b/build/build.c
@@ -8,6 +8,8 @@
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
 
+#include "debug.h"
+
 static int _build_debug = 0;
 
 static void doRmSource(Spec spec)
@@ -23,7 +25,7 @@ static void doRmSource(Spec spec)
 	if (! (p->flags & RPMBUILD_ISNO)) {
 	    const char *fn = rpmGetPath("%{_sourcedir}/", p->source, NULL);
 	    unlink(fn);
-	    xfree(fn);
+	    free((void *)fn);
 	}
     }
 
@@ -32,7 +34,7 @@ static void doRmSource(Spec spec)
 	    if (! (p->flags & RPMBUILD_ISNO)) {
 		const char *fn = rpmGetPath("%{_sourcedir}/", p->source, NULL);
 		unlink(fn);
-		xfree(fn);
+		free((void *)fn);
 	    }
 	}
     }
@@ -211,7 +213,7 @@ exit:
     if (scriptName) {
 	if (!rc)
 	    Unlink(scriptName);
-	xfree(scriptName);
+	free((void *)scriptName);
     }
     if (u) {
 	switch (u->urltype) {
diff --git a/build/expression.c b/build/expression.c
index 7c6ed1256..7179ac056 100644
--- a/build/expression.c
+++ b/build/expression.c
@@ -13,8 +13,10 @@
 
 #include "system.h"
 
-#include "rpmbuild.h"
-#include "rpmlib.h"
+#include <rpmbuild.h>
+#include <rpmlib.h>
+
+#include "debug.h"
 
 /* #define DEBUG_PARSER 1 */
 
@@ -25,7 +27,6 @@
 #define DEBUG(x)
 #endif
 
-
 /*
  * Encapsulation of a "value"
  */
@@ -62,7 +63,7 @@ static Value valueMakeString(/*@only@*/ const char *s)
 static void valueFree( /*@only@*/ Value v)
 {
   if (v) {
-    if (v->type == VALUE_TYPE_STRING) xfree(v->data.s);
+    if (v->type == VALUE_TYPE_STRING) free((void *)v->data.s);
     free(v);
   }
 }
diff --git a/build/files.c b/build/files.c
index 9427d4ad2..ad7dc21f9 100644
--- a/build/files.c
+++ b/build/files.c
@@ -19,6 +19,7 @@
 
 #include "myftw.h"
 #include "md5.h"
+#include "debug.h"
 
 #define	SKIPWHITE(_x)	{while(*(_x) && (isspace(*_x) || *(_x) == ',')) (_x)++;}
 #define	SKIPNONWHITE(_x){while(*(_x) &&!(isspace(*_x) || *(_x) == ',')) (_x)++;}
@@ -577,7 +578,7 @@ static int parseForRegexLang(const char *fileName, /*@out@*/char **lang)
 	    rc = 1;
 	else if (regcomp(&compiledPatt, patt, REG_EXTENDED))
 	    rc = -1;
-	xfree(patt);
+	free((void *)patt);
 	if (rc)
 	    return rc;
 	hasRegex = 1;
@@ -615,7 +616,7 @@ static int parseForRegexMultiLib(const char *fileName)
 	    rc = 1;
 	else if (regcomp(&compiledPatt, patt, REG_EXTENDED | REG_NOSUB))
 	    rc = -1;
-	xfree(patt);
+	free((void *)patt);
 	if (rc)
 	    return rc;
 	hasRegex = 1;
@@ -735,7 +736,7 @@ static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char *buf,
 
 		ddir = rpmGetPath("%{_docdir}/", n, "-", v, NULL);
 		strcpy(buf, ddir);
-		xfree(ddir);
+		free((void *)ddir);
 	    }
 
 	/* XXX FIXME: this is easy to do as macro expansion */
@@ -1176,9 +1177,9 @@ static int processBinaryFile(/*@unused@*/Package pkg, struct FileList *fl,
 	if (rc == 0 && argc >= 1 && !myGlobPatternP(argv[0])) {
 	    for (i = 0; i < argc; i++) {
 		rc = addFile(fl, argv[i], NULL);
-		xfree(argv[i]);
+		free((void *)argv[i]);
 	    }
-	    xfree(argv);
+	    free((void *)argv);
 	} else {
 	    rpmError(RPMERR_BADSPEC, _("File not found by glob: %s"), diskURL);
 	    rc = 1;
@@ -1189,7 +1190,7 @@ static int processBinaryFile(/*@unused@*/Package pkg, struct FileList *fl,
 
 exit:
     if (diskURL)
-	xfree(diskURL);
+	free((void *)diskURL);
     if (rc)
 	fl->processingFailed = 1;
     return rc;
@@ -1236,7 +1237,7 @@ static int processPackageFiles(Spec spec, Package pkg,
 		ffn, Fstrerror(fd));
 	    return RPMERR_BADFILENAME;
 	}
-	xfree(ffn);
+	free((void *)ffn);
 
 	while (fgets(buf, sizeof(buf), (FILE *)fdGetFp(fd))) {
 	    handleComments(buf);
@@ -1285,6 +1286,9 @@ static int processPackageFiles(Spec spec, Package pkg,
     fl.docDirs[fl.docDirCount++] = xstrdup("/usr/man");
     fl.docDirs[fl.docDirCount++] = xstrdup("/usr/info");
     fl.docDirs[fl.docDirCount++] = xstrdup("/usr/X11R6/man");
+    fl.docDirs[fl.docDirCount++] = xstrdup("/usr/share/doc");
+    fl.docDirs[fl.docDirCount++] = xstrdup("/usr/share/man");
+    fl.docDirs[fl.docDirCount++] = xstrdup("/usr/share/info");
     fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_docdir}", NULL);
     fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_mandir}", NULL);
     fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_infodir}", NULL);
@@ -1315,7 +1319,7 @@ static int processPackageFiles(Spec spec, Package pkg,
 	if (fl.currentLangs) {
 	    int i;
 	    for (i = 0; i < fl.nLangs; i++)
-		xfree(fl.currentLangs[i]);
+		free((void *)fl.currentLangs[i]);
 	    FREE(fl.currentLangs);
 	}
   	fl.nLangs = 0;
@@ -1361,7 +1365,7 @@ static int processPackageFiles(Spec spec, Package pkg,
 	if (fl.currentLangs) {
 	    int i;
 	    for (i = 0; i < fl.nLangs; i++)
-		xfree(fl.currentLangs[i]);
+		free((void *)fl.currentLangs[i]);
 	    FREE(fl.currentLangs);
 	}
   	fl.nLangs = 0;
@@ -1395,7 +1399,7 @@ static int processPackageFiles(Spec spec, Package pkg,
     if (fl.currentLangs) {
 	int i;
 	for (i = 0; i < fl.nLangs; i++)
-	    xfree(fl.currentLangs[i]);
+	    free((void *)fl.currentLangs[i]);
 	FREE(fl.currentLangs);
     }
 
@@ -1505,7 +1509,7 @@ int processSourceFiles(Spec spec)
 	s = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
 		"%{_sourcedir}/", srcPtr->source, NULL);
 	appendLineStringBuf(sourceFiles, s);
-	xfree(s);
+	free((void *)s);
       }
     }
 
@@ -1515,7 +1519,7 @@ int processSourceFiles(Spec spec)
 	    s = rpmGetPath( ((srcPtr->flags & RPMBUILD_ISNO) ? "!" : ""),
 		"%{_sourcedir}/", srcPtr->source, NULL);
 	    appendLineStringBuf(sourceFiles, s);
-	    xfree(s);
+	    free((void *)s);
 	}
     }
 
diff --git a/build/misc.c b/build/misc.c
index 95b95937b..1e6b026e4 100644
--- a/build/misc.c
+++ b/build/misc.c
@@ -4,6 +4,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 /** */
 int parseNum(const char *line, int *res)
diff --git a/build/myftw.c b/build/myftw.c
index 4b036bfe6..dff0adac0 100644
--- a/build/myftw.c
+++ b/build/myftw.c
@@ -43,6 +43,7 @@ Cambridge, MA 02139, USA.  */
 #endif
 
 #include "myftw.h"
+#include "debug.h"
 
 /* Traverse one level of a directory tree.  */
 
diff --git a/build/names.c b/build/names.c
index 7aa5399d7..6cdbee988 100644
--- a/build/names.c
+++ b/build/names.c
@@ -7,6 +7,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 static uid_t uids[1024];
 /*@owned@*/ /*@null@*/ static const char *unames[1024];
@@ -20,9 +21,9 @@ void freeNames(void)
 {
     int x;
     for (x = 0; x < uid_used; x++)
-	xfree(unames[x]);
+	free((void *)unames[x]);
     for (x = 0; x < gid_used; x++)
-	xfree(gnames[x]);
+	free((void *)gnames[x]);
 }
 
 const char *getUname(uid_t uid)
diff --git a/build/pack.c b/build/pack.c
index b201ef5d8..4ef703bc8 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -12,6 +12,7 @@
 #include "misc.h"
 #include "signature.h"
 #include "rpmlead.h"
+#include "debug.h"
 
 extern int _noDirTokens;
 
@@ -51,8 +52,8 @@ static int cpio_doio(FD_t fdo, CSA_t * csa, const char * fmodeMacro)
 
     Fclose(cfd);
     if (failedFile)
-	xfree(failedFile);
-    xfree(fmode);
+	free((void *)failedFile);
+    free((void *)fmode);
 
     return rc;
 }
@@ -88,7 +89,7 @@ static StringBuf addFileToTagAux(Spec spec, const char *file, StringBuf sb)
     fn = rpmGetPath("%{_builddir}/", spec->buildSubdir, "/", file, NULL);
 
     fd = Fopen(fn, "r.ufdio");
-    if (fn != buf) xfree(fn);
+    if (fn != buf) free((void *)fn);
     if (fd == NULL || Ferror(fd)) {
 	freeStringBuf(sb);
 	return NULL;
@@ -316,7 +317,7 @@ int writeRPM(Header *hdrp, const char *fileName, int type,
 	break;
     }
     if (!(rpmio_flags && *rpmio_flags)) {
-	if (rpmio_flags) xfree(rpmio_flags);
+	if (rpmio_flags) free((void *)rpmio_flags);
 	rpmio_flags = xstrdup("w9.gzdio");
     }
     s = strchr(rpmio_flags, '.');
@@ -367,7 +368,7 @@ int writeRPM(Header *hdrp, const char *fileName, int type,
 	    rc = RPMERR_BADARG;
 	}
     }
-    if (rpmio_flags) xfree(rpmio_flags);
+    if (rpmio_flags) free((void *)rpmio_flags);
 
     if (rc)
 	goto exit;
@@ -529,7 +530,7 @@ exit:
     }
     if (sigtarget) {
 	Unlink(sigtarget);
-	xfree(sigtarget);
+	free((void *)sigtarget);
     }
 
     if (rc == 0)
@@ -583,7 +584,7 @@ int packageBinaries(Spec spec)
     {	const char * optflags = rpmExpand("%{optflags}", NULL);
 	headerAddEntry(pkg->header, RPMTAG_OPTFLAGS, RPM_STRING_TYPE,
 			optflags, 1);
-	xfree(optflags);
+	free((void *)optflags);
     }
 
 	genSourceRpmName(spec);
@@ -594,7 +595,7 @@ int packageBinaries(Spec spec)
 	    char *binRpm, *binDir;
 	    binRpm = headerSprintf(pkg->header, binFormat, rpmTagTable,
 			       rpmHeaderFormats, &errorString);
-	    xfree(binFormat);
+	    free((void *)binFormat);
 	    if (binRpm == NULL) {
 		const char *name;
 		headerNVR(pkg->header, &name, NULL, NULL);
@@ -620,9 +621,9 @@ int packageBinaries(Spec spec)
 			break;
 		    }
 		}
-		xfree(dn);
+		free((void *)dn);
 	    }
-	    xfree(binRpm);
+	    free((void *)binRpm);
 	}
 
 	memset(csa, 0, sizeof(*csa));
@@ -634,7 +635,7 @@ int packageBinaries(Spec spec)
 	rc = writeRPM(&pkg->header, fn, RPMLEAD_BINARY,
 		    csa, spec->passPhrase, NULL);
 	csa->cpioFdIn = fdFree(csa->cpioFdIn, "init (packageBinaries)");
-	xfree(fn);
+	free((void *)fn);
 	if (rc)
 	    return rc;
     }
@@ -671,7 +672,7 @@ int packageSources(Spec spec)
 	rc = writeRPM(&spec->sourceHeader, fn, RPMLEAD_SOURCE,
 		csa, spec->passPhrase, &(spec->cookie));
 	csa->cpioFdIn = fdFree(csa->cpioFdIn, "init (packageSources)");
-	xfree(fn);
+	free((void *)fn);
     }
     return rc;
 }
diff --git a/build/parseBuildInstallClean.c b/build/parseBuildInstallClean.c
index ca6ee93fa..cb9397abf 100644
--- a/build/parseBuildInstallClean.c
+++ b/build/parseBuildInstallClean.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 int parseBuildInstallClean(Spec spec, rpmParseState parsePart)
 {
diff --git a/build/parseChangelog.c b/build/parseChangelog.c
index 4edd4f25d..3326d6fae 100644
--- a/build/parseChangelog.c
+++ b/build/parseChangelog.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 /** */
 void addChangelogEntry(Header h, time_t time, const char *name, const char *text)
diff --git a/build/parseDescription.c b/build/parseDescription.c
index 5b44c8b9f..e889cf244 100644
--- a/build/parseDescription.c
+++ b/build/parseDescription.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 extern int noLang;		/* XXX FIXME: pass as arg */
 
diff --git a/build/parseFiles.c b/build/parseFiles.c
index a0fb91da8..0f3139778 100644
--- a/build/parseFiles.c
+++ b/build/parseFiles.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 /* These have to be global scope to make up for *stupid* compilers */
     /*@observer@*/ /*@null@*/ static const char *name = NULL;
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index b96b0c222..3294d4135 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "debug.h"
 
 static int_32 copyTagsDuringParse[] = {
     RPMTAG_EPOCH,
@@ -282,7 +283,7 @@ static void fillOutMainPackage(Header h)
 	    const char *val = rpmExpand(ot->ot_mac, NULL);
 	    if (val && *val != '%')
 		headerAddEntry(h, ot->ot_tag, RPM_STRING_TYPE, (void *)val, 1);
-	    xfree(val);
+	    free((void *)val);
 	}
     }
 }
@@ -336,7 +337,7 @@ static int readIcon(Header h, const char *file)
 	rc = RPMERR_BADSPEC;
 	goto exit;
     }
-    xfree(icon);
+    free((void *)icon);
     
 exit:
     FREE(fn);
@@ -476,7 +477,7 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro,
 	    } else {
 		const char * specURL = field;
 
-		xfree(buildRootURL);
+		free((void *)buildRootURL);
 		(void) urlPath(specURL, (const char **)&field);
 		if (*field == '\0') field = "/";
 		buildRootURL = rpmGenPath(spec->rootURL, field, NULL);
@@ -493,10 +494,10 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro,
 	if (!strcmp(buildRoot, "/")) {
 	    rpmError(RPMERR_BADSPEC,
 		     _("BuildRoot can not be \"/\": %s"), spec->buildRootURL);
-	    xfree(buildRootURL);
+	    free((void *)buildRootURL);
 	    return RPMERR_BADSPEC;
 	}
-	xfree(buildRootURL);
+	free((void *)buildRootURL);
       }	break;
       case RPMTAG_PREFIXES:
 	addOrAppendListEntry(pkg->header, tag, field);
diff --git a/build/parsePrep.c b/build/parsePrep.c
index da99e357b..f1aa47039 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "debug.h"
 
 /* These have to be global to make up for stupid compilers */
     static int leaveDirs, skipDefaultAction;
@@ -93,7 +94,7 @@ static int checkOwners(const char *urlfn)
 
     /* XXX On non-build parse's, file cannot be stat'd or read */
     if (!spec->force && (isCompressed(urlfn, &compressed) || checkOwners(urlfn))) {
-	xfree(urlfn);
+	free((void *)urlfn);
 	return NULL;
     }
 
@@ -105,7 +106,7 @@ static int checkOwners(const char *urlfn)
     case URL_IS_UNKNOWN:
 	break;
     case URL_IS_DASH:
-	xfree(urlfn);
+	free((void *)urlfn);
 	return NULL;
 	/*@notreached@*/ break;
     }
@@ -125,7 +126,7 @@ static int checkOwners(const char *urlfn)
 		c, (const char *) basename(fn),
 		zipper,
 		fn, strip, args);
-	xfree(zipper);
+	free((void *)zipper);
     } else {
 	sprintf(buf,
 		"echo \"Patch #%d (%s):\"\n"
@@ -133,7 +134,7 @@ static int checkOwners(const char *urlfn)
 		strip, args, fn);
     }
 
-    xfree(urlfn);
+    free((void *)urlfn);
     return buf;
 }
 
@@ -189,7 +190,7 @@ static int checkOwners(const char *urlfn)
 
     /* XXX On non-build parse's, file cannot be stat'd or read */
     if (!spec->force && (isCompressed(urlfn, &compressed) || checkOwners(urlfn))) {
-	xfree(urlfn);
+	free((void *)urlfn);
 	return NULL;
     }
 
@@ -201,7 +202,7 @@ static int checkOwners(const char *urlfn)
     case URL_IS_UNKNOWN:
 	break;
     case URL_IS_DASH:
-	xfree(urlfn);
+	free((void *)urlfn);
 	return NULL;
 	/*@notreached@*/ break;
     }
@@ -226,7 +227,7 @@ static int checkOwners(const char *urlfn)
 	zipper = rpmGetPath(t, NULL);
 	buf[0] = '\0';
 	t = stpcpy(buf, zipper);
-	xfree(zipper);
+	free((void *)zipper);
 	*t++ = ' ';
 	t = stpcpy(t, fn);
 	if (needtar)
@@ -244,7 +245,7 @@ static int checkOwners(const char *urlfn)
 	t = stpcpy(t, fn);
     }
 
-    xfree(urlfn);
+    free((void *)urlfn);
     return buf;
 }
 
@@ -337,7 +338,7 @@ static int doSetupMacro(Spec spec, char *line)
 	(void) urlPath(buildDirURL, &buildDir);
 	sprintf(buf, "cd %s", buildDir);
 	appendLineStringBuf(spec->prep, buf);
-	xfree(buildDirURL);
+	free((void *)buildDirURL);
     }
     
     /* delete any old sources */
@@ -390,7 +391,7 @@ static int doSetupMacro(Spec spec, char *line)
 	    const char *fix = rpmExpand(*fm, " .", NULL);
 	    if (fix && *fix != '%')
 		appendLineStringBuf(spec->prep, fix);
-	    xfree(fix);
+	    free((void *)fix);
 	}
     }
     
diff --git a/build/parseReqs.c b/build/parseReqs.c
index 4c27df55f..225c7a679 100644
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 static struct ReqComp {
     char *token;
diff --git a/build/parseScript.c b/build/parseScript.c
index b0c9bedcb..7dec4476d 100644
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 static int addTriggerIndex(Package pkg, const char *file, const char *script, const char *prog)
 {
diff --git a/build/parseSpec.c b/build/parseSpec.c
index d66e0dfe6..b27d62360 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -9,6 +9,7 @@ static int _debug = 0;
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "debug.h"
 
 /**
  */
@@ -240,22 +241,22 @@ retry:
 	const char *arch = rpmExpand("%{_target_cpu}", NULL);
 	s += 7;
 	match = matchTok(arch, s);
-	xfree(arch);
+	free((void *)arch);
     } else if (! strncmp("%ifnarch", s, sizeof("%ifnarch")-1)) {
 	const char *arch = rpmExpand("%{_target_cpu}", NULL);
 	s += 8;
 	match = !matchTok(arch, s);
-	xfree(arch);
+	free((void *)arch);
     } else if (! strncmp("%ifos", s, sizeof("%ifos")-1)) {
 	const char *os = rpmExpand("%{_target_os}", NULL);
 	s += 5;
 	match = matchTok(os, s);
-	xfree(os);
+	free((void *)os);
     } else if (! strncmp("%ifnos", s, sizeof("%ifnos")-1)) {
 	const char *os = rpmExpand("%{_target_os}", NULL);
 	s += 6;
 	match = !matchTok(os, s);
-	xfree(os);
+	free((void *)os);
     } else if (! strncmp("%if", s, sizeof("%if")-1)) {
 	s += 3;
         match = parseExpressionBoolean(spec, s);
@@ -471,7 +472,7 @@ fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootU
 		    }
 #ifdef	DYING
 		    rpmSetMachine(saveArch, NULL);
-		    xfree(saveArch);
+		    free((void *)saveArch);
 #else
 		    delMacro(NULL, "_target_cpu");
 #endif
@@ -547,8 +548,8 @@ fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootU
 #ifdef	DYING
     FREE(myos);
 #else
-    xfree(arch);
-    xfree(os);
+    free((void *)arch);
+    free((void *)os);
 #endif
   }
 
diff --git a/build/reqprov.c b/build/reqprov.c
index f96158e7c..b9ff99e4c 100644
--- a/build/reqprov.c
+++ b/build/reqprov.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "debug.h"
 
 /** */
 int addReqProv(/*@unused@*/ Spec spec, Header h,
diff --git a/build/spec.c b/build/spec.c
index 49ac89074..52f6dc3e9 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -7,6 +7,7 @@
 
 #include "rpmbuild.h"
 #include "buildio.h"
+#include "debug.h"
 
 extern int specedit;
 extern MacroContext rpmGlobalMacroContext;
@@ -345,7 +346,7 @@ int addSource(Spec spec, Package pkg, const char *field, int tag)
 	sprintf(buf, "%sURL%d",
 		(flag & RPMBUILD_ISPATCH) ? "PATCH" : "SOURCE", num);
 	addMacro(spec->macros, buf, NULL, p->fullSource, RMIL_SPEC);
-	xfree(body);
+	free((void *)body);
     }
     
     return 0;
diff --git a/configure.in b/configure.in
index 530954acb..cc391baa1 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ dnl it, why check it?
 AC_INIT(rpm.c)
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(rpm, 4.1)
+AM_INIT_AUTOMAKE(rpm, 4.0.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_PREREQ(2.12)         dnl Minimum Autoconf version required.
@@ -723,21 +723,21 @@ fi
 dnl
 dnl Auto-detect whether python bindings should be built.
 dnl
-AC_ARG_WITH(python, [  --with-python           build rpm python bindings ],
-  rpm_cv_python=yes, rpm_cv_python=no)
+withval=auto
+AC_ARG_WITH(python, [  --with-python           build rpm python bindings ])
 
-if test $rpm_cv_python = no ; then
+if test $withval = auto ; then
   AC_MSG_CHECKING(for python 1.5.2)
   AC_TRY_RUN([
 #include <python1.5/Python.h>
 main() {
   exit(strcmp("1.5.2", PY_VERSION));
 } ],
-  rpm_cv_python=yes, rpm_cv_python=no, rpm_cv_python=no)
-  AC_MSG_RESULT([$rpm_cv_python])
+  withval=yes, withval=no, withval=no)
+  AC_MSG_RESULT($with_val)
 fi
 
-if test $rpm_cv_python = yes; then
+if test $withval = yes ; then
   WITH_PYTHON_SUBDIR=python
   WITH_PYTHON_SUBPACKAGE=1
 else
@@ -751,21 +751,16 @@ AC_PATH_PROG(__DOXYGEN, doxygen, no, $PATH)
 dnl
 dnl Auto-detect whether doxygen generated API docs should be included.
 dnl
-AC_ARG_WITH(apidocs, [  --with-apidocs           build rpm API docs ],
-  [ if test __DOXYGEN = no; then
-      AC_MSG_ERROR(--> rpm API docs need doxygen in PATH)
-    fi
-    rpm_cv_apidocs=yes
-  ],
-  [ if test __DOXYGEN = no; then
-      rpm_cv_apidocs=no
-    else
-      rpm_cv_apidocs=yes
-    fi
-  ]
-)
+withval=auto
+AC_ARG_WITH(apidocs, [  --with-apidocs          build rpm API docs ])
 
-if test $rpm_cv_apidocs = yes; then
+if test $withval = auto -a $__DOXYGEN != no ; then
+  withval=yes
+elif test $withval = yes -a $__DOXYGEN = no ; then
+  AC_MSG_ERROR(--> rpm API docs needs doxygen in PATH)
+fi
+
+if test $withval = yes; then
   WITH_APIDOCS_TARGET=apidocs
   WITH_APIDOCS=1
 else
@@ -774,6 +769,13 @@ fi
 AC_SUBST(WITH_APIDOCS_TARGET)
 AC_SUBST(WITH_APIDOCS)
 
+withval=no
+AC_ARG_WITH(dmalloc, [  --with-dmalloc          build with dmalloc debugging support ])
+if test $withval = yes ; then
+  AC_DEFINE(DMALLOC)
+  LIBS="$LIBS -ldmalloc"
+fi
+
 AC_CHECK_FUNCS(setlocale)
 
 dnl XXX Solaris <= 2.6 only permits 8 chars in password.
diff --git a/convertdb.c b/convertdb.c
index d38d3ce1e..091a36431 100644
--- a/convertdb.c
+++ b/convertdb.c
@@ -9,6 +9,7 @@
 #include "falloc.h"
 #include "oldrpmdb.h"
 #include "oldheader.h"
+#include "debug.h"
 
 int convertDB(void);
 
diff --git a/debug.h b/debug.h
new file mode 100644
index 000000000..44c8d6471
--- /dev/null
+++ b/debug.h
@@ -0,0 +1,20 @@
+/**
+ * To be included after all other includes.
+ */
+#ifndef	H_DEBUG
+#define	H_DEBUG
+
+#include <assert.h>
+
+#ifdef  __LCLINT__
+#define	ntohl(_x)	(_x)
+#define	ntohs(_x)	(_x)
+#define	htonl(_x)	(_x)
+#define	htons(_x)	(_x)
+#endif
+
+#ifdef	DMALLOC
+#include <dmalloc.h>
+#endif
+
+#endif	/* H_DEBUG */
diff --git a/lib/cpio.c b/lib/cpio.c
index 687135dc0..e5bc39245 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -8,11 +8,10 @@
  */
 
 #include "system.h"
-
 #include "cpio.h"
-/*@access FD_t@*/
+#include "debug.h"
 
-#define	xfree(_p)	free((void *)_p)
+/*@access FD_t@*/
 
 #define CPIO_NEWC_MAGIC	"070701"
 #define CPIO_CRC_MAGIC	"070702"
@@ -500,7 +499,7 @@ static int expandRegular(FD_t cfd, const struct cpioHeader * hdr,
 	} else {
 	    if (strcmp(md5sum, filemd5))
 		rc = CPIOERR_MD5SUM_MISMATCH;
-	    xfree(md5sum);
+	    free((void *)md5sum);
 	}
     }
 
@@ -750,7 +749,7 @@ int cpioInstallArchive(FD_t cfd, const struct cpioFileMapping * mappings,
 	struct stat * st;
 
 	if (hdr->path) {
-	    xfree(hdr->path);
+	    free((void *)hdr->path);
 	    hdr->path = NULL;
 	}
 	if ((rc = getNextHeader(cfd, hdr))) {
@@ -775,7 +774,7 @@ int cpioInstallArchive(FD_t cfd, const struct cpioFileMapping * mappings,
 	} else {
 	    if (map) {
 		if (map->mapFlags & CPIO_MAP_PATH) {
-		    if (hdr->path) xfree(hdr->path);
+		    if (hdr->path) free((void *)hdr->path);
 		    hdr->path = xstrdup(map->fsPath);
 		}
 
@@ -871,7 +870,7 @@ int cpioInstallArchive(FD_t cfd, const struct cpioFileMapping * mappings,
     } while (rc == 0);
 
     if (hdr->path) {
-	xfree(hdr->path);
+	free((void *)hdr->path);
 	hdr->path = NULL;
     }
 
diff --git a/lib/db1.c b/lib/db1.c
index fc4ccd81c..d0319c67b 100644
--- a/lib/db1.c
+++ b/lib/db1.c
@@ -1,9 +1,9 @@
-#include "system.h"
-
 /** \ingroup db1
  * \file lib/db1.c
  */
 
+#include "system.h"
+
 static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 
 #ifdef HAVE_DB1_DB_H
@@ -32,6 +32,9 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 
 #define	DBC	void
 #include "rpmdb.h"
+
+#include "debug.h"
+
 /*@access rpmdb@*/
 /*@access dbiIndex@*/
 /*@access dbiIndexSet@*/
@@ -136,6 +139,9 @@ static void * doGetRecord(FD_t pkgs, unsigned int offset)
     if (h == NULL)
 	goto exit;
 
+    /* Retrofit "Provide: name = EVR" for binary packages. */
+    providePackageNVR(h);
+
     /*
      * The RPM used to build much of RH 5.1 could produce packages whose
      * file lists did not have leading /'s. Now is a good time to fix that.
@@ -388,9 +394,9 @@ static int db1close(/*@only@*/ dbiIndex dbi, /*@unused@*/ unsigned int flags)
 
     db3Free(dbi);
     if (base)
-	xfree(base);
+	free((void *)base);
     if (urlfn)
-	xfree(urlfn);
+	free((void *)urlfn);
     return rc;
 }
 
@@ -468,11 +474,11 @@ exit:
 	db1close(dbi, 0);
 
     if (base) {
-	xfree(base);
+	free((void *)base);
 	base = NULL;
     }
     if (urlfn) {
-	xfree(urlfn);
+	free((void *)urlfn);
 	urlfn = NULL;
     }
 
diff --git a/lib/db2.c b/lib/db2.c
index 8359dd257..f397d2d9f 100644
--- a/lib/db2.c
+++ b/lib/db2.c
@@ -1,18 +1,18 @@
-#include "system.h"
-
 /** \ingroup db2
  * \file lib/db2.c
  */
 
 static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 
+#include "system.h"
 #include <db2/db.h>
-
 #include <rpmlib.h>
 #include <rpmmacro.h>
 #include <rpmurl.h>	/* XXX urlPath proto */
 
 #include "rpmdb.h"
+#include "debug.h"
+
 /*@access dbiIndex@*/
 /*@access dbiIndexSet@*/
 
@@ -578,7 +578,7 @@ static int db2close(dbiIndex dbi, unsigned int flags)
     dbi->dbi_db = NULL;
 
     if (urlfn)
-	xfree(urlfn);
+	free((void *)urlfn);
 
     db2Free(dbi);
 
@@ -756,7 +756,7 @@ static int db2open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
     }
 
     if (urlfn)
-	xfree(urlfn);
+	free((void *)urlfn);
 
     return rc;
 }
diff --git a/lib/db3.c b/lib/db3.c
index c9c9eacfe..a5caa3186 100644
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -1,5 +1,3 @@
-#include "system.h"
-
 /** \ingroup db3
  * \file lib/db3.c
  */
@@ -13,6 +11,8 @@ typedef	unsigned char u_int8_t;
 typedef	int int32_t;
 #endif
 
+#include "system.h"
+
 #include <db3/db.h>
 
 #include <rpmlib.h>
@@ -20,6 +20,8 @@ typedef	int int32_t;
 #include <rpmurl.h>	/* XXX urlPath proto */
 
 #include "rpmdb.h"
+#include "debug.h"
+
 /*@access rpmdb@*/
 /*@access dbiIndex@*/
 /*@access dbiIndexSet@*/
@@ -200,15 +202,15 @@ static int dbSaveInt(const struct dbOption * opt, long aLong) {
 
 void db3Free(dbiIndex dbi) {
     if (dbi) {
-	if (dbi->dbi_root)	xfree(dbi->dbi_root);
-	if (dbi->dbi_home)	xfree(dbi->dbi_home);
-	if (dbi->dbi_file)	xfree(dbi->dbi_file);
-	if (dbi->dbi_subfile)	xfree(dbi->dbi_subfile);
-	if (dbi->dbi_errpfx)	xfree(dbi->dbi_errpfx);
-	if (dbi->dbi_re_source)	xfree(dbi->dbi_re_source);
+	if (dbi->dbi_root)	free((void *)dbi->dbi_root);
+	if (dbi->dbi_home)	free((void *)dbi->dbi_home);
+	if (dbi->dbi_file)	free((void *)dbi->dbi_file);
+	if (dbi->dbi_subfile)	free((void *)dbi->dbi_subfile);
+	if (dbi->dbi_errpfx)	free((void *)dbi->dbi_errpfx);
+	if (dbi->dbi_re_source)	free((void *)dbi->dbi_re_source);
 	if (dbi->dbi_dbenv)	free(dbi->dbi_dbenv);
 	if (dbi->dbi_dbinfo)	free(dbi->dbi_dbinfo);
-	xfree(dbi);
+	free((void *)dbi);
     }
 }
 
@@ -277,7 +279,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
 	    	break;
 	    case POPT_ARG_STRING:
 	    {	const char ** t = opt->arg;
-		if (*t) xfree(*t);
+		if (*t) free((void *)*t);
 		*t = xstrdup( (p ? p : "") );
 	    }	break;
 
@@ -933,7 +935,7 @@ static int db3close(/*@only@*/ dbiIndex dbi, /*@unused@*/ unsigned int flags)
     dbi->dbi_db = NULL;
 
     if (urlfn)
-	xfree(urlfn);
+	free((void *)urlfn);
 
     db3Free(dbi);
 
@@ -1171,7 +1173,7 @@ static int db3open(/*@keep@*/ rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	db3close(dbi, 0);
 
     if (urlfn)
-	xfree(urlfn);
+	free((void *)urlfn);
 
     return rc;
 }
diff --git a/lib/depends.c b/lib/depends.c
index 60dc46bdd..06a5990fe 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1,16 +1,17 @@
-#include "system.h"
-
-int _depends_debug = 0;
-
 /** \ingroup rpmdep
  * \file lib/depends.c
  */
 
+int _depends_debug = 0;
+
+#include "system.h"
+
 #include <rpmlib.h>
 
 #include "depends.h"
 #include "rpmdb.h"
 #include "misc.h"
+#include "debug.h"
 
 /*@access dbiIndex@*/		/* XXX compared with NULL */
 /*@access dbiIndexSet@*/	/* XXX compared with NULL */
@@ -21,12 +22,21 @@ int _depends_debug = 0;
 int headerNVR(Header h, const char **np, const char **vp, const char **rp)
 {
     int type, count;
-    if (np && !headerGetEntry(h, RPMTAG_NAME, &type, (void **) np, &count))
-	*np = NULL;
-    if (vp && !headerGetEntry(h, RPMTAG_VERSION, &type, (void **) vp, &count))
-	*vp = NULL;
-    if (rp && !headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) rp, &count))
-	*rp = NULL;
+    if (np) {
+	if (!(headerGetEntry(h, RPMTAG_NAME, &type, (void **) np, &count)
+	    && type == RPM_STRING_TYPE && count == 1))
+		*np = NULL;
+    }
+    if (vp) {
+	if (!(headerGetEntry(h, RPMTAG_VERSION, &type, (void **) vp, &count)
+	    && type == RPM_STRING_TYPE && count == 1))
+		*vp = NULL;
+    }
+    if (rp) {
+	if (!(headerGetEntry(h, RPMTAG_RELEASE, &type, (void **) rp, &count)
+	    && type == RPM_STRING_TYPE && count == 1))
+		*rp = NULL;
+    }
     return 0;
 }
 
@@ -164,8 +174,8 @@ static void alFree(struct availableList * al)
 
 	if (p->relocs) {
 	    for (r = p->relocs; (r->oldPath || r->newPath); r++) {
-		if (r->oldPath) xfree(r->oldPath);
-		if (r->newPath) xfree(r->newPath);
+		if (r->oldPath) free((void *)r->oldPath);
+		if (r->newPath) free((void *)r->newPath);
 	    }
 	    free(p->relocs);
 	}
@@ -174,7 +184,7 @@ static void alFree(struct availableList * al)
     }
 
     for (i = 0; i < al->numDirs; i++) {
-	xfree(al->dirs[i].dirName);
+	free((void *)al->dirs[i].dirName);
 	free(al->dirs[i].files);
     }
 
@@ -582,8 +592,8 @@ int rpmRangesOverlap(const char *AName, const char *AEVR, int AFlags,
 exit:
     rpmMessage(RPMMESS_DEBUG, _("  %s    A %s\tB %s\n"),
 	(result ? "YES" : "NO "), aDepend, bDepend);
-    if (aDepend) xfree(aDepend);
-    if (bDepend) xfree(bDepend);
+    if (aDepend) free((void *)aDepend);
+    if (bDepend) free((void *)bDepend);
     return result;
 }
 
@@ -616,7 +626,7 @@ static int rangeMatchesDepFlags (Header h, const char *reqName, const char * req
 
     if (!headerGetEntry(h, RPMTAG_PROVIDENAME, &type,
 		(void **) &provides, &providesCount)) {
-	if (providesEVR) xfree(providesEVR);
+	if (providesEVR) free((void *)providesEVR);
 	return 0;	/* XXX should never happen */
     }
 
@@ -635,8 +645,8 @@ static int rangeMatchesDepFlags (Header h, const char *reqName, const char * req
 	    break;
     }
 
-    if (provides) xfree(provides);
-    if (providesEVR) xfree(providesEVR);
+    if (provides) free((void *)provides);
+    if (providesEVR) free((void *)providesEVR);
 
     return result;
 }
@@ -863,9 +873,9 @@ void rpmtransFree(rpmTransactionSet rpmdep)
     if (rpmdep->scriptFd)
 	rpmdep->scriptFd = fdFree(rpmdep->scriptFd, "rpmtransSetScriptFd (rpmtransFree");
     if (rpmdep->rootDir)
-	xfree(rpmdep->rootDir);
+	free((void *)rpmdep->rootDir);
     if (rpmdep->currDir)
-	xfree(rpmdep->currDir);
+	free((void *)rpmdep->currDir);
 
     free(rpmdep);
 }
@@ -918,7 +928,7 @@ alFileSatisfiesDepend(struct availableList * al,
     dirNeedle.dirNameLen = strlen(dirName);
     dirMatch = bsearch(&dirNeedle, al->dirs, al->numDirs,
 		       sizeof(dirNeedle), dirInfoCompare);
-    xfree(dirName);
+    free((void *)dirName);
     if (!dirMatch) return NULL;
 
     baseName = strrchr(fileName, '/') + 1;
@@ -1054,7 +1064,7 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep,
 	}
     }
 
-#ifdef	DYING
+#ifndef	DYING
   { const char * rcProvidesString;
     const char * start;
     int i;
@@ -1123,6 +1133,22 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep,
 	    }
 	}
 	rpmdbFreeIterator(mi);
+
+#ifndef DYING
+	mi = rpmdbInitIterator(rpmdep->rpmdb, RPMTAG_NAME, keyName, 0);
+	rpmdbPruneIterator(mi,
+			rpmdep->removedPackages, rpmdep->numRemovedPackages, 1);
+	while ((h = rpmdbNextIterator(mi)) != NULL) {
+	    if (rangeMatchesDepFlags(h, keyName, keyEVR, keyFlags)) {
+		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db package)\n"),
+			keyType, keyDepend+2);
+		rpmdbFreeIterator(mi);
+		goto exit;
+	    }
+	}
+	rpmdbFreeIterator(mi);
+#endif
+
     }
 
     if (suggestion)
@@ -1238,7 +1264,7 @@ static int checkPackageDeps(rpmTransactionSet rpmdep, struct problemsSet * psp,
 	    ourrc = 1;
 	    break;
 	}
-	xfree(keyDepend);
+	free((void *)keyDepend);
     }
 
     if (requiresCount) {
@@ -1303,7 +1329,7 @@ static int checkPackageDeps(rpmTransactionSet rpmdep, struct problemsSet * psp,
 	    ourrc = 1;
 	    break;
 	}
-	xfree(keyDepend);
+	free((void *)keyDepend);
     }
 
     if (conflictsCount) {
@@ -1771,7 +1797,7 @@ rescan:
 		rpmMessage(RPMMESS_NORMAL, "    %-40s %s\n", buf, dp);
 
 		if (dp) {
-		    xfree(dp);
+		    free((void *)dp);
 		    dp = NULL;
 		}
 	    }
@@ -1935,7 +1961,7 @@ int rpmdepCheck(rpmTransactionSet rpmdep,
 		    break;
 		    }
 		}
-		xfree(provides);
+		free((void *)provides);
 		if (rc)
 		    goto exit;
 	    }
diff --git a/lib/falloc.c b/lib/falloc.c
index 1652ccd19..55faf471a 100644
--- a/lib/falloc.c
+++ b/lib/falloc.c
@@ -1,5 +1,3 @@
-#include "system.h"
-
 /** \ingroup rpmio db1
  * \file lib/falloc.c
  * 
@@ -13,8 +11,10 @@
  *
  */
 
+#include "system.h"
 #include <rpmio_internal.h>
 #include "falloc.h"
+#include "debug.h"
 
 /** \ingroup db1
  */
diff --git a/lib/fileutil.c b/lib/fileutil.c
index 2c3aa70b7..2d2cd19d4 100644
--- a/lib/fileutil.c
+++ b/lib/fileutil.c
@@ -1,12 +1,11 @@
-#include "system.h"
-
 /**
  * \file lib/fileutil.c
  */
 
+#include "system.h"
 #include <rpmlib.h>
-
 #include "misc.h"
+#include "debug.h"
 
 static struct {
     const char *token;
diff --git a/lib/formats.c b/lib/formats.c
index 88c256f6f..dd8ddcd46 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -1,12 +1,12 @@
-#include "system.h"
-
 /** \ingroup header
  * \file lib/formats.c
  */
 
+#include "system.h"
 #include <rpmlib.h>
 #include <rpmmacro.h>	/* XXX for %_i18ndomains */
 #include "misc.h"
+#include "debug.h"
 
 /**
  * Return ls-like formatted mode string.
diff --git a/lib/fprint.c b/lib/fprint.c
index 866af714b..7fea93442 100644
--- a/lib/fprint.c
+++ b/lib/fprint.c
@@ -1,13 +1,13 @@
-#include "system.h"
-
 /**
  * \file lib/fprint.c
  */
 
+#include "system.h"
 #include <rpmlib.h>
 #include <rpmmacro.h>	/* XXX for rpmCleanPath */
 
 #include "fprint.h"
+#include "debug.h"
 
 fingerPrintCache fpCacheCreate(int sizeHint)
 {
diff --git a/lib/fs.c b/lib/fs.c
index 9e1dfaa18..3257b9532 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -1,11 +1,11 @@
-#include "system.h"
-
 /**
  * \file lib/fs.c
  */
 
+#include "system.h"
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include <rpmmacro.h>	/* XXX for rpmGetPath */
+#include "debug.h"
 
 struct fsinfo {
 /*@only@*/ const char * mntPoint;	/*!< path to mount point. */
@@ -22,7 +22,7 @@ void freeFilesystems(void)
     if (filesystems) {
 	int i;
 	for (i = 0; i < numFilesystems; i++)
-	    xfree(filesystems[i].mntPoint);
+	    free((void *)filesystems[i].mntPoint);
 	free(filesystems);
 	filesystems = NULL;
     }
@@ -286,7 +286,7 @@ int rpmGetFilesystemUsage(const char ** fileList, int_32 * fssizes, int numFiles
 		if (errno != ENOENT) {
 		    rpmError(RPMERR_STAT, _("failed to stat %s: %s"), buf,
 				strerror(errno));
-		    xfree(sourceDir);
+		    free((void *)sourceDir);
 		    free(usages);
 		    return 1;
 		}
@@ -307,7 +307,7 @@ int rpmGetFilesystemUsage(const char ** fileList, int_32 * fssizes, int numFiles
 		if (j == numFilesystems) {
 		    rpmError(RPMERR_BADDEV, 
 				_("file %s is on an unknown device"), buf);
-		    xfree(sourceDir);
+		    free((void *)sourceDir);
 		    free(usages);
 		    return 1;
 		}
@@ -321,7 +321,7 @@ int rpmGetFilesystemUsage(const char ** fileList, int_32 * fssizes, int numFiles
 	usages[lastfs] += fssizes[i];
     }
 
-    if (sourceDir) xfree(sourceDir);
+    if (sourceDir) free((void *)sourceDir);
 
     *usagesPtr = usages;
 
diff --git a/lib/hash.c b/lib/hash.c
index a8c67acac..d9f162b86 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -4,9 +4,9 @@
  */
 
 #include "system.h"
-
 #include <rpmlib.h>
 #include "hash.h"
+#include "debug.h"
 
 typedef /*@owned@*/ const void * voidptr;
 
@@ -125,12 +125,12 @@ void htFree(hashTable ht)
 
     for (i = 0; i < ht->numBuckets; i++) {
 	b = ht->buckets[i];
-	if (ht->keySize && b) xfree(b->key);
+	if (ht->keySize && b) free((void *)b->key);
 	while (b) {
 	    n = b->next;
 	    if (b->data) {
-		if (ht->freeData && *b->data) xfree(*b->data);
-		xfree(b->data);
+		if (ht->freeData && *b->data) free((void *)*b->data);
+		free((void *)b->data);
 	    }
 	    free(b);
 	    b = n;
diff --git a/lib/header.c b/lib/header.c
index fcfe8328d..3b77a02bd 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -1,8 +1,9 @@
 /** \ingroup header
  * \file lib/header.c
- *
  */
 
+#undef	REMALLOC_HEADER_REGION
+
 /* RPM - Copyright (C) 1995-2000 Red Hat Software */
 
 /* Data written to file descriptors is in network byte order.    */
@@ -11,22 +12,23 @@
 
 #include "system.h"
 
-#ifdef	__LCLINT__
-#define	ntohl(_x)	(_x)
-#define	ntohs(_x)	(_x)
-#define	htonl(_x)	(_x)
-#define	htons(_x)	(_x)
-#else
+#if !defined(__LCLINT__)
 #include <netinet/in.h>
 #endif	/* __LCLINT__ */
 
-#include <rpmio.h>
 #include <header.h>
-#include <assert.h>
 
-/* XXX avoid rpmlib.h for debugging. */
+#include "debug.h"
+
+/* XXX avoid rpmlib.h, need for debugging. */
 /*@observer@*/ const char *const tagName(int tag)	/*@*/;
 
+/*
+ * Teach header.c about legacy tags.
+ */
+#define	HEADER_OLDFILENAMES	1027
+#define	HEADER_BASENAMES	1117
+
 #define INDEX_MALLOC_SIZE 8
 
 #define PARSER_BEGIN 	0
@@ -76,6 +78,7 @@ struct indexEntry {
     struct entryInfo info;	/*!< Description of tag data. */
     void * data; 		/*!< Location of tag data. */
     int length;			/*!< No. bytes of data. */
+    int rdlen;			/*!< No. bytes of data in region. */
 };
 
 /**
@@ -87,7 +90,7 @@ struct headerToken {
     int indexAlloced;		/*!< Allocated size of tag array. */
     int region_allocated;	/*!< Is 1st header region allocated? */
     int sorted; 		/*!< Are header entries sorted? */
-    int reloaded;		/*!< Append region data? */
+    int legacy;			/*!< Header came from legacy source? */
 /*@refs@*/ int nrefs;	/*!< Reference count. */
 };
 
@@ -262,30 +265,41 @@ static int dataLength(int_32 type, const void * p, int_32 count, int onDisk)
  * @param dl		start no. bytes of data
  * @param pe		header physical entry pointer (swapped)
  * @param dataStart	header data
- * @param myoffset	translate start of data (must be 0 now)
+ * @param regionid	region offset
  * @return		no. bytes of data in region
  */
 static int regionSwab(struct indexEntry * entry, int il, int dl,
-		const struct entryInfo * pe, char * dataStart, int myoff)
+		const struct entryInfo * pe, char * dataStart, int regionid)
 {
     for (; il > 0; il--, pe++) {
 	struct indexEntry ie;
+	int_32 type;
 	void * t;
 
 	ie.info.tag = ntohl(pe->tag);
 	ie.info.type = ntohl(pe->type);
-assert(ie.info.type >= RPM_MIN_TYPE && ie.info.type <= RPM_MAX_TYPE);
+	assert(ie.info.type >= RPM_MIN_TYPE && ie.info.type <= RPM_MAX_TYPE);
 	ie.info.count = ntohl(pe->count);
 	ie.info.offset = ntohl(pe->offset);
-	ie.data = t = dataStart + ie.info.offset + myoff;
+	ie.data = t = dataStart + ie.info.offset;
 	ie.length = dataLength(ie.info.type, ie.data, ie.info.count, 1);
+	ie.rdlen = 0;
 
 	if (entry) {
-	    ie.info.offset = ((char *)pe - dataStart);	/* negative offset */
+	    ie.info.offset = regionid;
 	    *entry = ie;	/* structure assignment */
 	    entry++;
 	}
 
+	/* Alignment */
+	type = ie.info.type;
+	if (typeSizes[type] > 1) {
+	    unsigned diff;
+	    diff = typeSizes[type] - (dl % typeSizes[type]);
+	    if (diff != typeSizes[type]) {
+		dl += diff;
+	    }
+	}
 	dl += ie.length;
 
 	/* Perform endian conversions */
@@ -315,22 +329,25 @@ static void copyEntry(const struct indexEntry * entry, /*@out@*/ int_32 * type,
 	/*@out@*/ const void ** p, /*@out@*/ int_32 * c, int minMem)
 		/*@modifies *type, *p, *c @*/
 {
-    if (type) 
-	*type = entry->info.type;
-    if (c) 
-	*c = entry->info.count;
-    if (p == NULL)
-	return;
+    int_32 count = entry->info.count;
 
-    /* Now look it up */
+    if (p)
     switch (entry->info.type) {
     case RPM_BIN_TYPE:
+	count = entry->length;
 	*p = (!minMem
-		? memcpy(xmalloc(entry->length), entry->data, entry->length)
+		? memcpy(xmalloc(count), entry->data, count)
 		: entry->data);
+	if (ENTRY_IS_REGION(entry)) {
+	    struct entryInfo * pe = (struct entryInfo *) *p;
+	    int_32 rdl = -entry->info.offset;	/* negative offset */
+	    int_32 ril = rdl/sizeof(*pe);
+	    char * dataStart = (char *) (pe + ril);
+	    (void) regionSwab(NULL, ril, 0, pe, dataStart, 0);
+	}
 	break;
     case RPM_STRING_TYPE:
-	if (entry->info.count == 1) {
+	if (count == 1) {
 	    *p = entry->data;
 	    break;
 	}
@@ -338,20 +355,20 @@ static void copyEntry(const struct indexEntry * entry, /*@out@*/ int_32 * type,
     case RPM_STRING_ARRAY_TYPE:
     case RPM_I18NSTRING_TYPE:
     {	const char ** ptrEntry;
+	int tableSize = count * sizeof(char *);
 	char * t;
-	int i = entry->info.count;
-	int tableSize = i * sizeof(char *);
+	int i;
 
 	if (minMem) {
-	    ptrEntry = *p = xmalloc(tableSize);
+	    ptrEntry = (const char **) *p = xmalloc(tableSize);
 	    t = entry->data;
 	} else {
 	    t = xmalloc(tableSize + entry->length);
-	    ptrEntry = *p = (void *)t;
+	    ptrEntry = (const char **) *p = (void *)t;
 	    t += tableSize;
 	    memcpy(t, entry->data, entry->length);
 	}
-	while (i--) {
+	for (i = 0; i < count; i++) {
 	    *ptrEntry++ = t;
 	    t = strchr(t, 0);
 	    t++;
@@ -362,6 +379,8 @@ static void copyEntry(const struct indexEntry * entry, /*@out@*/ int_32 * type,
 	*p = entry->data;
 	break;
     }
+    if (type) *type = entry->info.type;
+    if (c) *c = count;
 }
 
 /**
@@ -394,12 +413,17 @@ int headerNextIterator(HeaderIterator hi,
 {
     Header h = hi->h;
     int slot = hi->next_index;
-    struct indexEntry * entry; 
+    struct indexEntry * entry = NULL;;
 
-    if (slot >= h->indexUsed)
+    for (slot = hi->next_index; slot < h->indexUsed; slot++) {
+	entry = h->index + slot;
+	if (!ENTRY_IS_REGION(entry))
+	    break;
+    }
+    hi->next_index = slot;
+    if (entry == NULL || slot >= h->indexUsed)
 	return 0;
     hi->next_index++;
-    entry = h->index + slot;
 
     if (tag)
 	*tag = entry->info.tag;
@@ -440,68 +464,80 @@ void headerUnsort(Header h)
 
 Header headerCopy(Header h)
 {
-    Header res = headerNew();
+    Header nh = headerNew();
     HeaderIterator hi;
     int_32 tag, type, count;
     const void *ptr;
-    int prevtag = 0;
    
     for (hi = headerInitIterator(h);
 	headerNextIterator(hi, &tag, &type, &ptr, &count);
 	ptr = headerFreeData((void *)ptr, type))
     {
-	if (prevtag && prevtag > tag)
-	    res->sorted = 0;
-	prevtag = tag;
-	headerAddEntry(res, tag, type, ptr, count);
+	headerAddEntry(nh, tag, type, ptr, count);
     }
     headerFreeIterator(hi);
 
-    return res;
+    return headerReload(nh, HEADER_IMAGE);
 }
 
-Header headerLoad(void *pv)
+Header headerLoad(void *uh)
 {
-    int_32 *ei = (int_32 *) pv;
+    int_32 *ei = (int_32 *) uh;
     int_32 il = ntohl(ei[0]);		/* index length */
     int_32 dl = ntohl(ei[1]);		/* data length */
     int pvlen = sizeof(il) + sizeof(dl) +
                (il * sizeof(struct entryInfo)) + dl;
+#ifdef	REMALLOC_HEADER_REGION
+    void * pv = memcpy(xmalloc(pvlen), uh, pvlen);
+#else
+    void * pv = uh;
+#endif
     Header h = xcalloc(1, sizeof(*h));
-
-    struct entryInfo * pe = (struct entryInfo *) &ei[2];
-    char * dataStart = (char *) (pe + il);
+    struct entryInfo * pe;
+    char * dataStart;
     struct indexEntry * entry; 
+    int rdlen;
     int i;
 
+    ei = (int_32 *) pv;
+    pe = (struct entryInfo *) &ei[2];
+    dataStart = (char *) (pe + il);
+
     h->indexAlloced = il + 1;
     h->indexUsed = il;
     h->index = xcalloc(h->indexAlloced, sizeof(*h->index));
     h->sorted = 1;
-    h->reloaded = 0;
+#ifdef	REMALLOC_HEADER_REGION
+    h->region_allocated = 1;
+#else
+    h->region_allocated = 0;
+#endif
     h->nrefs = 1;
 
     entry = h->index;
     i = 0;
     if (!(htonl(pe->tag) < HEADER_I18NTABLE)) {
+	h->legacy = 1;
 	entry->info.type = REGION_TAG_TYPE;
 	entry->info.tag = HEADER_IMAGE;
 	entry->info.count = REGION_TAG_COUNT;
-	entry->info.offset = ((char *)(pe-1) - dataStart); /* negative offset */
+	entry->info.offset = ((char *)pe - dataStart); /* negative offset */
+
 	entry->data = pe;
 	entry->length = pvlen - sizeof(il) - sizeof(dl);
+	rdlen = regionSwab(entry+1, il, 0, pe, dataStart, entry->info.offset);
+	entry->rdlen = rdlen;
+assert(rdlen == dl);
+
 	entry++;
-	regionSwab(entry, il, 0, pe, dataStart, 0);
-	i++;
-	il++;
 	h->indexUsed++;
     } else {
-	int_32 * stei = memcpy(alloca(REGION_TAG_COUNT), dataStart + ntohl(pe->offset), REGION_TAG_COUNT);
+	int nb = ntohl(pe->count);
+	int_32 * stei = memcpy(alloca(nb), dataStart + ntohl(pe->offset), nb);
 	int_32 rdl = -ntohl(stei[2]);	/* negative offset */
 	int_32 ril = rdl/sizeof(*pe);
-	int dlen;
-	int j = 0;
 
+	h->legacy = 0;
 	entry->info.type = htonl(pe->type);
 	if (entry->info.type < RPM_MIN_TYPE || entry->info.type > RPM_MAX_TYPE)
 	    return NULL;
@@ -509,15 +545,41 @@ Header headerLoad(void *pv)
 	entry->info.count = htonl(pe->count);
 	entry->info.offset = -rdl;	/* negative offset */
 
+	entry->data = pe;
 	entry->length = pvlen - sizeof(il) - sizeof(dl);
-	dlen = regionSwab(entry+1, ril-1, 0, pe+1, dataStart, 0);
-	entry->data = dataStart + entry->info.offset;
+	rdlen = regionSwab(entry+1, ril-1, 0, pe+1, dataStart, entry->info.offset);
+	entry->rdlen = rdlen;
+
+	if (ril < h->indexUsed) {
+	    struct indexEntry * newEntry = entry + ril;
+	    int ne = (h->indexUsed - ril);
+	    int rid = entry->info.offset+1;
+
+	    /* Load dribble entries from region. */
+	    rdlen += regionSwab(newEntry, ne, 0, pe+ril, dataStart, rid);
+
+	  { struct indexEntry * firstEntry = newEntry;
+	    int save = h->indexUsed;
+	    int j;
+
+	    /* Dribble entries replace duplicate region entries. */
+	    h->indexUsed -= ne;
+	    for (j = 0; j < ne; j++, newEntry++) {
+		headerRemoveEntry(h, newEntry->info.tag);
+		if (newEntry->info.tag == HEADER_BASENAMES)
+		    headerRemoveEntry(h, HEADER_OLDFILENAMES);
+	    }
 
-	j += ril;
+	    /* If any duplicate entries were replaced, move new entries down. */
+	    if (h->indexUsed < (save - ne)) {
+		memmove(h->index + h->indexUsed, firstEntry,
+			(ne * sizeof(*entry)));
+	    }
+	    h->indexUsed += ne;
+	  }
 
-	if (j < h->indexUsed) {
-	    dlen = regionSwab(entry+ril, h->indexUsed-ril, dlen, pe+ril, dataStart, 0);
 	}
+
     }
 
     h->sorted = 0;
@@ -533,26 +595,81 @@ static /*@only@*/ void * doHeaderUnload(Header h, /*@out@*/ int * lengthPtr)
     struct entryInfo * pe;
     char * dataStart;
     char * te;
-    unsigned pad = 0;
+    unsigned pad;
     unsigned len;
-    int_32 il;
-    int_32 dl;
+    int_32 il = 0;
+    int_32 dl = 0;
     struct indexEntry * entry; 
+    int_32 type;
     int i;
+    int drlen, ndribbles;
+    int driplen, ndrips;
+    int legacy = 0;
 
-    /* Sort entries by (region,tag) */
+    /* Sort entries by (offset,tag). */
     headerUnsort(h);
 
-    /* XXX Hack to avoid the headerSort() undoing headerUnsort. */
-    i = h->sorted;
-    h->sorted = 1;
-    len = headerSizeof(h, HEADER_MAGIC_NO);
-    h->sorted = i;
+    /* Compute (il,dl) for all tags, including those deleted in region. */
+    pad = 0;
+    drlen = ndribbles = driplen = ndrips = 0;
+    for (i = 0, entry = h->index; i < h->indexUsed; i++, entry++) {
+	if (ENTRY_IS_REGION(entry)) {
+	    int_32 rdl = -entry->info.offset;	/* negative offset */
+	    int_32 ril = rdl/sizeof(*pe);
+	    int rid = entry->info.offset;
 
-    il = h->indexUsed;
-    dl = len - (sizeof(il) + sizeof(dl) + (il * sizeof(struct entryInfo)));
-    entry = h->index;
-    i = 0;
+	    il += ril;
+	    dl += entry->rdlen + entry->info.count;
+	    /* XXX Legacy regions do not include the region tag and data. */
+	    if (i == 0 && h->legacy)
+		il += 1;
+
+	    /* Skip rest of entries in region, but account for dribbles. */
+	    for (; i < h->indexUsed && entry->info.offset <= rid+1; i++, entry++) {
+		if (entry->info.offset <= rid)
+		    continue;
+
+		/* Alignment */
+		type = entry->info.type;
+		if (typeSizes[type] > 1) {
+		    unsigned diff;
+		    diff = typeSizes[type] - (dl % typeSizes[type]);
+		    if (diff != typeSizes[type]) {
+			drlen += diff;
+			pad += diff;
+			dl += diff;
+		    }
+		}
+
+		ndribbles++;
+		il++;
+		drlen += entry->length;
+		dl += entry->length;
+	    }
+	    i--;
+	    entry--;
+	    continue;
+	}
+
+	/* Alignment */
+	type = entry->info.type;
+	if (typeSizes[type] > 1) {
+	    unsigned diff;
+	    diff = typeSizes[type] - (dl % typeSizes[type]);
+	    if (diff != typeSizes[type]) {
+		driplen += diff;
+		pad += diff;
+		dl += diff;
+	    } else
+		diff = 0;
+	}
+
+	ndrips++;
+	il++;
+	driplen += entry->length;
+	dl += entry->length;
+    }
+    len = sizeof(il) + sizeof(dl) + (il * sizeof(*pe)) + dl;
 
     ei = xmalloc(len);
     ei[0] = htonl(il);
@@ -561,51 +678,68 @@ static /*@only@*/ void * doHeaderUnload(Header h, /*@out@*/ int * lengthPtr)
     pe = (struct entryInfo *) &ei[2];
     dataStart = te = (char *) (pe + il);
 
-    for (; i < h->indexUsed; i++, entry++, pe++) {
-const char *t;
+    pad = 0;
+    for (i = 0, entry = h->index; i < h->indexUsed; i++, entry++) {
 	const char * src;
-	int_32 type;
+char *t;
 	int count;
-	int dlen;
+	int rdlen;
 
 t = te;
+	pe->tag = htonl(entry->info.tag);
+	pe->type = htonl(entry->info.type);
+	pe->count = htonl(entry->info.count);
+
 	if (ENTRY_IS_REGION(entry)) {
 	    int_32 rdl = -entry->info.offset;	/* negative offset */
-	    int_32 ril = rdl/sizeof(*pe);
-
-src = (char *)entry->data;
-dlen = (entry->length - rdl + sizeof(*pe));
+	    int_32 ril = rdl/sizeof(*pe) + ndribbles;
+	    int rid = entry->info.offset;
 
-	    if (!(h->reloaded || entry->info.tag == HEADER_IMAGE)) {
-		src += sizeof(*pe);
-		dlen -= REGION_TAG_COUNT;
-	    }
+	    src = (char *)entry->data;
+	    rdlen = entry->rdlen;
 
-	    memcpy(pe+1, src,  (rdl - sizeof(*pe)));
-	    memcpy(te, src + rdl - sizeof(*pe), dlen);
-	    count = regionSwab(NULL, ril-1, 0, pe+1, te, 0);
-	    te += dlen;
+	    /* XXX Legacy regions do not include the region tag and data. */
+	    if (i == 0 && h->legacy) {
+		int_32 stei[4];
 
-	    pe->tag = htonl(entry->info.tag);
-	    pe->type = htonl(entry->info.type);
-	    pe->count = htonl(entry->info.count);
+		legacy = 1;
+		memcpy(pe+1, src, rdl);
+		memcpy(te, src + rdl, rdlen);
+		te += rdlen;
 
-	    if (!(h->reloaded || entry->info.tag == HEADER_IMAGE)) {
-		pe->offset = htonl(te - dataStart - REGION_TAG_COUNT);
-	    } else {
-		int_32 * stei = memcpy(alloca(REGION_TAG_COUNT), te, REGION_TAG_COUNT);
+		pe->offset = htonl(te - dataStart);
 		stei[0] = pe->tag;
 		stei[1] = pe->type;
-		stei[2] = htonl(-rdl);	/* YYY +REGION_TAG_COUNT */
+		stei[2] = htonl(-rdl-entry->info.count);
 		stei[3] = pe->count;
-		memcpy(te, stei, REGION_TAG_COUNT);
+		memcpy(te, stei, entry->info.count);
+		te += entry->info.count;
+		ril++;
+		rdlen += entry->info.count;
+
+		count = regionSwab(NULL, ril, 0, pe, t, 0);
+		assert(count == rdlen);
+
+	    } else {
+
+		memcpy(pe+1, src + sizeof(*pe), ((ril-1) * sizeof(*pe)));
+		memcpy(te, src + (ril * sizeof(*pe)), rdlen+entry->info.count+drlen);
+		te += rdlen;
 		pe->offset = htonl(te - dataStart);
-		te += REGION_TAG_COUNT;
+		te += entry->info.count + drlen;
+
+		count = regionSwab(NULL, ril, 0, pe, t, 0);
+		assert(count == rdlen+entry->info.count+drlen);
 	    }
 
-	    i += (ril-1);
-	    entry += (ril-1);
-	    pe += (ril-1);
+	    /* Skip rest of entries in region. */
+	    while (i < h->indexUsed && entry->info.offset <= rid+1) {
+		i++;
+		entry++;
+	    }
+	    i--;
+	    entry--;
+	    pe += ril;
 	    continue;
 	}
 
@@ -621,9 +755,6 @@ dlen = (entry->length - rdl + sizeof(*pe));
 	    }
 	}
 
-	pe->tag = htonl(entry->info.tag);
-	pe->type = htonl(entry->info.type);
-	pe->count = htonl(entry->info.count);
 	pe->offset = htonl(te - dataStart);
 
 	/* copy data w/ endian conversions */
@@ -653,9 +784,10 @@ dlen = (entry->length - rdl + sizeof(*pe));
 	    te += entry->length;
 	    break;
 	}
+	pe++;
     }
    
-    /* Insure that there are no memcpy dribbles. */
+    /* Insure that there are no memcpy underruns/overruns. */
     assert(((char *)pe) == dataStart);
     assert((((char *)ei)+len) == te);
 
@@ -683,8 +815,13 @@ Header headerReload(Header h, int tag)
 
     headerFree(h);
     nh = headerLoad(uh);
+    if (nh == NULL) {
+	free(uh);
+	return nh;
+    }
+    if (nh->region_allocated)
+	free(uh);
     nh->region_allocated = 1;
-    nh->reloaded = 1;
     if (ENTRY_IS_REGION(nh->index)) {
 	if (tag == HEADER_SIGNATURES || tag == HEADER_IMMUTABLE)
 	    nh->index[0].info.tag = tag;
@@ -694,11 +831,10 @@ Header headerReload(Header h, int tag)
 
 int headerWrite(FD_t fd, Header h, enum hMagic magicp)
 {
-    int length;
-    const void * uh;
     ssize_t nb;
+    int length;
+    const void * uh = doHeaderUnload(h, &length);
 
-    uh = doHeaderUnload(h, &length);
     switch (magicp) {
     case HEADER_MAGIC_YES:
 	nb = Fwrite(header_magic, sizeof(char), sizeof(header_magic), fd);
@@ -720,7 +856,7 @@ Header headerRead(FD_t fd, enum hMagic magicp)
 {
     int_32 block[4];
     int_32 reserved;
-    int_32 * ei;
+    int_32 * ei = NULL;
     int_32 il;
     int_32 dl;
     int_32 magic;
@@ -761,15 +897,18 @@ Header headerRead(FD_t fd, enum hMagic magicp)
     ei[1] = htonl(dl);
     len -= sizeof(il) + sizeof(dl);
 
-    if (timedRead(fd, (char *)&ei[2], len) != len) {
-	free(ei);
+    if (timedRead(fd, (char *)&ei[2], len) != len)
 	goto exit;
-    }
     
-    if ((h = headerLoad(ei)) != NULL)
-	h->region_allocated = 1;
+    h = headerLoad(ei);
 
 exit:
+    if (h) {
+	if (h->region_allocated)
+	    free(ei);
+	h->region_allocated = 1;
+    } else if (ei)
+	free(ei);
     return h;
 }
 
@@ -1149,9 +1288,9 @@ Header headerNew()
 
     h->indexAlloced = INDEX_MALLOC_SIZE;
     h->indexUsed = 0;
-    h->region_allocated = 1;
+    h->region_allocated = 0;
     h->sorted = 1;
-    h->reloaded = 0;
+    h->legacy = 0;
     h->nrefs = 1;
 
     h->index = (h->indexAlloced
@@ -1163,7 +1302,6 @@ Header headerNew()
 
 void headerFree(Header h)
 {
-
     if (h == NULL || --h->nrefs > 0)
 	return;
 
@@ -1204,14 +1342,11 @@ int headerUsageCount(Header h)
 unsigned int headerSizeof(Header h, enum hMagic magicp)
 {
     struct indexEntry * entry;
-    unsigned int size = 0, rsize = 0, pad = 0;
+    unsigned int size = 0, pad = 0;
     int i;
 
     headerSort(h);
 
-    size += sizeof(int_32);	/* count of index entries */
-    size += sizeof(int_32);	/* length of data */
-    size += sizeof(struct entryInfo) * h->indexUsed;
     switch (magicp) {
     case HEADER_MAGIC_YES:
 	size += sizeof(header_magic);
@@ -1220,17 +1355,25 @@ unsigned int headerSizeof(Header h, enum hMagic magicp)
 	break;
     }
 
-    entry = h->index;
-    for (i = 0; i < h->indexUsed; i++, entry++) {
+    size += 2 * sizeof(int_32);	/* count of index entries */
+
+    for (i = 0, entry = h->index; i < h->indexUsed; i++, entry++) {
 	unsigned diff;
 	int_32 type;
 
+	/* Regions go in as is ... */
         if (ENTRY_IS_REGION(entry)) {
-            if (entry->info.count > 0)
-                rsize += entry->info.count;
-            continue;
+	    size += entry->length;
+	    /* XXX Legacy regions do not include the region tag and data. */
+	    if (i == 0 && h->legacy)
+		size += sizeof(struct entryInfo) + entry->info.count;
+	    continue;
         }
 
+	/* ... and region elements are skipped. */
+	if (entry->info.offset < 0)
+	    continue;
+
 	/* Alignment */
 	type = entry->info.type;
 	if (typeSizes[type] > 1) {
@@ -1241,11 +1384,9 @@ unsigned int headerSizeof(Header h, enum hMagic magicp)
 	    }
 	}
 
-	size += entry->length;
+	size += sizeof(struct entryInfo) + entry->length;
     }
 
-    size += rsize;
-   
     return size;
 }
 
diff --git a/lib/header.h b/lib/header.h
index f293d40cc..a248d8b06 100644
--- a/lib/header.h
+++ b/lib/header.h
@@ -66,6 +66,7 @@
 /* WARNING: 1 means success, 0 means failure (yes, this is backwards) */
 
 #include <stdio.h>
+#include <rpmio.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/install.c b/lib/install.c
index da0521c68..0a4da9a34 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -12,7 +12,7 @@
 #include "install.h"
 #include "depends.h"
 #include "misc.h"
-#include <assert.h>
+#include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
 
@@ -247,7 +247,7 @@ static void trimChangelog(Header h)
 
     {	char *buf = rpmExpand("%{_instchangelog}", NULL);
 	if (!(buf && *buf != '%')) {
-	    xfree(buf);
+	    free((void *)buf);
 	    return;
 	}
 	numToKeep = strtol(buf, &end, 10);
@@ -255,10 +255,10 @@ static void trimChangelog(Header h)
 	if (!(end && *end == '\0')) {
 	    rpmError(RPMERR_RPMRC, _("%%instchangelog value in macro file "
 		 "should be a number, but isn't"));
-	    xfree(buf);
+	    free((void *)buf);
 	    return;
 	}
-	xfree(buf);
+	free((void *)buf);
     }
 
     if (numToKeep < 0) return;
@@ -678,7 +678,7 @@ static int installArchive(FD_t fd, struct fileInfo * files, int fileCount,
     }
 
     if (failedFile)
-	xfree(failedFile);
+	free((void *)failedFile);
 
     return rc;
 }
@@ -846,7 +846,7 @@ static int installSources(Header h, const char * rootDir, FD_t fd,
 	correctSpecFile = alloca(strlen(realSpecDir) + strlen(specFile) + 2);
 	(void)stpcpy(stpcpy(stpcpy(correctSpecFile,realSpecDir), "/"), specFile);
 
-	xfree(specFile);
+	free((void *)specFile);
 
 	if (strcmp(instSpecFile, correctSpecFile)) {
 	    rpmMessage(RPMMESS_DEBUG,
@@ -869,9 +869,9 @@ static int installSources(Header h, const char * rootDir, FD_t fd,
 
 exit:
     if (fileMem)	freeFileMemory(fileMem);
-    if (currDir)	xfree(currDir);
-    if (realSpecDir)	xfree(realSpecDir);
-    if (realSourceDir)	xfree(realSourceDir);
+    if (currDir)	free((void *)currDir);
+    if (realSpecDir)	free((void *)realSpecDir);
+    if (realSourceDir)	free((void *)realSourceDir);
     return rc;
 }
 
@@ -1018,7 +1018,7 @@ int installBinaryPackage(const rpmTransactionSet ts, FD_t fd, Header h,
 	{   const char *s = currentDirectory();
 	    currDir = alloca(strlen(s) + 1);
 	    strcpy(currDir, s);
-	    xfree(s);
+	    free((void *)s);
 	}
 
 	chdir("/");
diff --git a/lib/md5.c b/lib/md5.c
index 6edb4975e..20e00a152 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -19,8 +19,8 @@
  */
 
 #include "system.h"
-
 #include "md5.h"
+#include "debug.h"
 
 static int _ie = 0x44332211;
 static union _mendian { int i; char b[4]; } *_endian = (union _mendian *)&_ie;
diff --git a/lib/md5sum.c b/lib/md5sum.c
index 0bd07dde7..5aead8f36 100644
--- a/lib/md5sum.c
+++ b/lib/md5sum.c
@@ -10,10 +10,11 @@
  * Modified June 1993 by Colin Plumb for altered md5.c.
  * Modified October 1995 by Erik Troan for RPM
  */
-#include "system.h"
 
+#include "system.h"
 #include "md5.h"
 #include "rpmio_internal.h"
+#include "debug.h"
 
 /**
  * Calculate MD5 sum for file.
diff --git a/lib/misc.c b/lib/misc.c
index b10f2b0c6..1346d3735 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -11,6 +11,7 @@ static int _debug = 0;
 #include <rpmmacro.h>	/* XXX for rpmGetPath */
 
 #include "misc.h"
+#include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access FD_t@*/		/* XXX compared with NULL */
@@ -245,11 +246,11 @@ int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr)
 	char tfnbuf[64];
 #ifndef	NOTYET
 	sprintf(tfnbuf, "rpm-tmp.%d", ran++);
-	if (tempfn)	xfree(tempfn);
+	if (tempfn)	free((void *)tempfn);
 	tempfn = rpmGenPath(prefix, "%{_tmppath}/", tfnbuf);
 #else
 	strcpy(tfnbuf, "rpm-tmp.XXXXXX");
-	if (tempfn)	xfree(tempfn);
+	if (tempfn)	free((void *)tempfn);
 	tempfn = rpmGenPath(prefix, "%{_tmppath}/", mktemp(tfnbuf));
 #endif
 
@@ -300,7 +301,7 @@ int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr)
     if (fnptr)
 	*fnptr = tempfn;
     else if (tempfn) {
-	xfree(tempfn);
+	free((void *)tempfn);
 	tempfn = NULL;
     }
     *fdptr = fd;
@@ -308,7 +309,7 @@ int makeTempFile(const char * prefix, const char ** fnptr, FD_t * fdptr)
     return 0;
 
 errxit:
-    if (tempfn) xfree(tempfn);
+    if (tempfn) free((void *)tempfn);
     if (fd) Fclose(fd);
     return 1;
 }
@@ -353,6 +354,11 @@ void compressFilelist(Header h)
      * a bit faster.
      */
 
+    if (headerIsEntry(h, RPMTAG_DIRNAMES)) {
+	headerRemoveEntry(h, RPMTAG_OLDFILENAMES);
+	return;		/* Already converted. */
+    }
+
     if (!headerGetEntry(h, RPMTAG_OLDFILENAMES, NULL,
 			(void **) &fileNames, &count))
 	return;		/* no file list */
@@ -395,14 +401,14 @@ void compressFilelist(Header h)
     }
 
 exit:
-    headerAddEntry(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
-			dirNames, dirIndex + 1);
     headerAddEntry(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE,
 			dirIndexes, count);
     headerAddEntry(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
 			baseNames, count);
+    headerAddEntry(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
+			dirNames, dirIndex + 1);
 
-    xfree(fileNames);
+    free((void *)fileNames);
 
     headerRemoveEntry(h, RPMTAG_OLDFILENAMES);
 }
@@ -444,8 +450,8 @@ static void doBuildFileList(Header h, /*@out@*/ const char *** fileListPtr,
 	data = stpcpy( stpcpy(data, dirNames[dirIndexes[i]]), baseNames[i]);
 	*data++ = '\0';
     }
-    xfree(baseNames);
-    xfree(dirNames);
+    free((void *)baseNames);
+    free((void *)dirNames);
 
     *fileListPtr = fileNames;
     *fileCountPtr = count;
@@ -456,19 +462,18 @@ void expandFilelist(Header h)
     const char ** fileNames = NULL;
     int count = 0;
 
-    doBuildFileList(h, &fileNames, &count, RPMTAG_BASENAMES,
+    if (!headerIsEntry(h, RPMTAG_OLDFILENAMES)) {
+	doBuildFileList(h, &fileNames, &count, RPMTAG_BASENAMES,
 			RPMTAG_DIRNAMES, RPMTAG_DIRINDEXES);
-
-    if (fileNames == NULL || count <= 0)
-	return;
-
-    headerAddEntry(h, RPMTAG_OLDFILENAMES, RPM_STRING_ARRAY_TYPE,
+	if (fileNames == NULL || count <= 0)
+	    return;
+	headerAddEntry(h, RPMTAG_OLDFILENAMES, RPM_STRING_ARRAY_TYPE,
 			fileNames, count);
+	free((void *)fileNames);
+    }
 
-    xfree(fileNames);
-
-    headerRemoveEntry(h, RPMTAG_BASENAMES);
     headerRemoveEntry(h, RPMTAG_DIRNAMES);
+    headerRemoveEntry(h, RPMTAG_BASENAMES);
     headerRemoveEntry(h, RPMTAG_DIRINDEXES);
 }
 
@@ -601,7 +606,7 @@ fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL);
 	    argv[argc++] = xstrdup(globURL);
 	}
 	Globfree(&gl);
-	xfree(globURL);
+	free((void *)globURL);
     }
     if (argv != NULL && argc > 0) {
 	argv[argc] = NULL;
@@ -616,11 +621,11 @@ fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL);
 
 exit:
     if (av)
-	xfree(av);
+	free((void *)av);
     if ((rc || argvPtr == NULL) && argv) {
 	for (i = 0; i < argc; i++)
-	    xfree(argv[i]);
-	xfree(argv);
+	    free((void *)argv[i]);
+	free((void *)argv);
 	argv = NULL;
     }
     return rc;
@@ -778,15 +783,15 @@ void providePackageNVR(Header h)
     }
 
 exit:
-    if (provides) xfree(provides);
-    if (providesEVR) xfree(providesEVR);
+    if (provides) free((void *)provides);
+    if (providesEVR) free((void *)providesEVR);
 
     if (bingo) {
 	headerAddOrAppendEntry(h, RPMTAG_PROVIDENAME, RPM_STRING_ARRAY_TYPE,
 		&name, 1);
-	headerAddOrAppendEntry(h, RPMTAG_PROVIDEVERSION, RPM_STRING_ARRAY_TYPE,
-		&pEVR, 1);
 	headerAddOrAppendEntry(h, RPMTAG_PROVIDEFLAGS, RPM_INT32_TYPE,
 		&pFlags, 1);
+	headerAddOrAppendEntry(h, RPMTAG_PROVIDEVERSION, RPM_STRING_ARRAY_TYPE,
+		&pEVR, 1);
     }
 }
diff --git a/lib/package.c b/lib/package.c
index 0d1779af5..e0fed949e 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -4,12 +4,7 @@
 
 #include "system.h"
 
-#ifdef	__LCLINT__
-#define	ntohl(_x)	(_x)
-#define	ntohs(_x)	(_x)
-#define	htonl(_x)	(_x)
-#define	htons(_x)	(_x)
-#else
+#if !defined(__LCLINT__)
 #include <netinet/in.h>
 #endif	/* __LCLINT__ */
 
@@ -18,6 +13,7 @@
 #include "misc.h"
 #include "rpmlead.h"
 #include "signature.h"
+#include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
 
diff --git a/lib/poptBT.c b/lib/poptBT.c
index 0421016c8..6928c9894 100644
--- a/lib/poptBT.c
+++ b/lib/poptBT.c
@@ -9,6 +9,7 @@
 #include <rpmurl.h>
 
 #include "build.h"
+#include "debug.h"
 
 struct rpmBuildArguments         rpmBTArgs;
 
diff --git a/lib/poptQV.c b/lib/poptQV.c
index 595829afd..e37219a73 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -2,10 +2,12 @@
  * \file lib/poptQV.c
  *  Popt tables for query/verify modes.
  */
+
 #include "system.h"
 
 #include "rpmbuild.h"
 #include <rpmurl.h>
+#include "debug.h"
 
 struct rpmQVArguments rpmQVArgs;
 int specedit = 0;
diff --git a/lib/problems.c b/lib/problems.c
index b31e5f7e3..7a1e66e0b 100644
--- a/lib/problems.c
+++ b/lib/problems.c
@@ -8,6 +8,7 @@
 
 #include "depends.h"
 #include "misc.h"
+#include "debug.h"
 
 /*@access rpmProblemSet@*/
 /*@access rpmProblem@*/
@@ -85,89 +86,76 @@ void printDepProblems(FILE * fp, struct rpmDependencyConflict * conflicts,
     }
 }
 
-const char * rpmProblemString(rpmProblem prob) /*@modifies prob@*/
+const char * rpmProblemString(rpmProblem prob) /*@*/
 {
-    const char * name, * version, * release;
-    const char * altName = NULL, * altVersion = NULL, * altRelease = NULL;
-    char * buf;
-
-    headerNVR(prob->h, &name, &version, &release);
-
-    if (prob->altH)
-	headerNVR(prob->altH, &altName, &altVersion, &altRelease);
-
-    buf = xmalloc(strlen(name) + strlen(version) + strlen(release) + 400);
+    int nb =	(prob->pkgNEVR ? strlen(prob->pkgNEVR) : 0) +
+		(prob->str1 ? strlen(prob->str1) : 0) +
+		(prob->altNEVR ? strlen(prob->altNEVR) : 0) +
+		100;
+    char * buf = xmalloc(nb+1);
 
     switch (prob->type) {
-      case RPMPROB_BADARCH:
-	sprintf(buf, _("package %s-%s-%s is for a different architecture"), 
-		name, version, release);
+    case RPMPROB_BADARCH:
+	snprintf(buf, nb, _("package %s is for a different architecture"),
+		prob->pkgNEVR);
 	break;
-
-      case RPMPROB_BADOS:
-	sprintf(buf, _("package %s-%s-%s is for a different operating system"), 
-		name, version, release);
+    case RPMPROB_BADOS:
+	snprintf(buf, nb, _("package %s is for a different operating system"),
+		prob->pkgNEVR);
 	break;
-	
-      case RPMPROB_PKG_INSTALLED:
-	sprintf(buf, _("package %s-%s-%s is already installed"),
-		name, version, release);
+    case RPMPROB_PKG_INSTALLED:
+	snprintf(buf, nb, _("package %s is already installed"),
+		prob->pkgNEVR);
 	break;
-
-      case RPMPROB_BADRELOCATE:
-	sprintf(buf, _("path %s is not relocateable for package %s-%s-%s"),
-		prob->str1, name, version, release);
+    case RPMPROB_BADRELOCATE:
+	snprintf(buf, nb, _("path %s in package %s is not relocateable"),
+		prob->str1, prob->pkgNEVR);
 	break;
-
-      case RPMPROB_NEW_FILE_CONFLICT:
-	sprintf(buf, _("file %s conflicts between attemped installs of "
-		       "%s-%s-%s and %s-%s-%s"), prob->str1, name, version, 
-		release, altName, altVersion, altRelease);
+    case RPMPROB_NEW_FILE_CONFLICT:
+	snprintf(buf, nb,
+		_("file %s conflicts between attemped installs of %s and %s"),
+		prob->str1, prob->pkgNEVR, prob->altNEVR);
 	break;
-
-      case RPMPROB_FILE_CONFLICT:
-	sprintf(buf, _("file %s from install of %s-%s-%s conflicts with "
-		       "file from package %s-%s-%s"), prob->str1, name, version, 
-		release, altName, altVersion, altRelease);
+    case RPMPROB_FILE_CONFLICT:
+	snprintf(buf, nb,
+	    _("file %s from install of %s conflicts with file from package %s"),
+		prob->str1, prob->pkgNEVR, prob->altNEVR);
 	break;
-
-      case RPMPROB_OLDPACKAGE:
-	sprintf(buf, _("package %s-%s-%s (which is newer than %s-%s-%s) is "
-		       "already installed"), altName, altVersion, altRelease,
-			name, version, release);
+    case RPMPROB_OLDPACKAGE:
+	snprintf(buf, nb,
+		_("package %s (which is newer than %s) is already installed"),
+		prob->altNEVR, prob->pkgNEVR);
 	break;
-
-      case RPMPROB_DISKSPACE:
-	sprintf(buf, _("installing package %s-%s-%s needs %ld%cb on the %s"
-		       " filesystem"), name, version, release, 
-			prob->ulong1 > (1024*1024)
-			    ? (prob->ulong1 + 1024 * 1024 - 1) / (1024 * 1024)
-			    : (prob->ulong1 + 1023) / 1024,
-			prob->ulong1 > (1024*1024) ? 'M' : 'K',
-			prob->str1);
+    case RPMPROB_DISKSPACE:
+	snprintf(buf, nb,
+	    _("installing package %s needs %ld%cb on the %s filesystem"),
+		prob->pkgNEVR,
+		prob->ulong1 > (1024*1024)
+		    ? (prob->ulong1 + 1024 * 1024 - 1) / (1024 * 1024)
+		    : (prob->ulong1 + 1023) / 1024,
+		prob->ulong1 > (1024*1024) ? 'M' : 'K',
+		prob->str1);
 	break;
-
-      case RPMPROB_DISKNODES:
-	sprintf(buf, _("installing package %s-%s-%s needs %ld inodes on the %s"
-		       " filesystem"), name, version, release, 
-			(long)prob->ulong1,
-			prob->str1);
+    case RPMPROB_DISKNODES:
+	snprintf(buf, nb,
+	    _("installing package %s needs %ld inodes on the %s filesystem"),
+		prob->pkgNEVR, (long)prob->ulong1, prob->str1);
 	break;
-
-      case RPMPROB_BADPRETRANS:
-	sprintf(buf, _("package %s-%s-%s pre-transaction syscall(s): %s failed: %s"),
-			name, version, release, 
-			prob->str1, strerror(prob->ulong1));
+    case RPMPROB_BADPRETRANS:
+	snprintf(buf, nb,
+		_("package %s pre-transaction syscall(s): %s failed: %s"),
+		prob->pkgNEVR, prob->str1, strerror(prob->ulong1));
 	break;
-
-      case RPMPROB_REQUIRES:
-      case RPMPROB_CONFLICT:
-      default:
-	sprintf(buf, _("unknown error %d encountered while manipulating "
-		"package %s-%s-%s"), prob->type, name, version, release);
+    case RPMPROB_REQUIRES:
+    case RPMPROB_CONFLICT:
+    default:
+	snprintf(buf, nb,
+		_("unknown error %d encountered while manipulating package %s"),
+		prob->type, prob->pkgNEVR);
 	break;
     }
 
+    buf[nb] = '\0';
     return buf;
 }
 
@@ -175,7 +163,7 @@ void rpmProblemPrint(FILE *fp, rpmProblem prob)
 {
     const char *msg = rpmProblemString(prob);
     fprintf(fp, "%s\n", msg);
-    xfree(msg);
+    free((void *)msg);
 }
 
 void rpmProblemSetPrint(FILE *fp, rpmProblemSet probs)
diff --git a/lib/query.c b/lib/query.c
index 5537af7e2..a4c82b969 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -8,8 +8,9 @@
 # define PATH_MAX 255
 #endif
 
-#include "rpmbuild.h"
+#include <rpmbuild.h>
 #include <rpmurl.h>
+#include "debug.h"
 
 /*@access Header@*/			/* XXX compared with NULL */
 /*@access rpmdbMatchIterator@*/		/* XXX compared with NULL */
@@ -381,7 +382,7 @@ printNewSpecfile(Spec spec)
 
 	fmt[0] = '\0';
 	(void) stpcpy( stpcpy( stpcpy( fmt, "%{"), tn), "}\n");
-	if (msgstr) xfree(msgstr);
+	if (msgstr) free((void *)msgstr);
 	msgstr = headerSprintf(h, fmt, rpmTagTable, rpmHeaderFormats, &errstr);
 	if (msgstr == NULL) {
 	    fprintf(stderr, _("can't query %s: %s\n"), tn, errstr);
@@ -416,7 +417,7 @@ printNewSpecfile(Spec spec)
 	    break;
 	}
     }
-    if (msgstr) xfree(msgstr);
+    if (msgstr) free((void *)msgstr);
 
     for (i = 0; i < sl->sl_nlines; i++) {
 	if (sl->sl_lines[i] == NULL)
@@ -538,8 +539,8 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg,
 	}
 	if (argv) {
 	    for (i = 0; i < argc; i++)
-		xfree(argv[i]);
-	    xfree(argv);
+		free((void *)argv[i]);
+	    free((void *)argv);
 	}
     }	break;
 
@@ -668,7 +669,7 @@ int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg,
 	} else {
 	    retcode = showMatches(qva, mi, showPackage);
 	}
-	xfree(fn);
+	free((void *)fn);
     }	break;
 
     case RPMQV_DBOFFSET:
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 7f2bb78ac..6f67eb0aa 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -10,6 +10,7 @@
 #include "rpmlead.h"
 #include "signature.h"
 #include "misc.h"	/* XXX for makeTempFile() */
+#include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access FD_t@*/		/* XXX compared with NULL */
@@ -201,7 +202,7 @@ l = malloc(sizeof(*l));
 
 	/* Clean up intermediate target */
 	unlink(sigtarget);
-	xfree(sigtarget);	sigtarget = NULL;
+	free((void *)sigtarget);	sigtarget = NULL;
 
 	/* Move final target into place. */
 	unlink(rpm);
@@ -221,7 +222,7 @@ if (l != &lead) free(l);
     }
     if (sigtarget) {
 	unlink(sigtarget);
-	xfree(sigtarget);
+	free((void *)sigtarget);
 	sigtarget = NULL;
     }
     if (tmprpm[0] != '\0') {
@@ -301,7 +302,7 @@ l = malloc(sizeof(*l));
 	for (sigIter = headerInitIterator(sig);
 	    headerNextIterator(sigIter, &tag, &type, &ptr, &count);
 	    ptr = ((type == RPM_STRING_ARRAY_TYPE || type == RPM_I18NSTRING_TYPE)
-		? xfree(ptr), NULL : NULL))
+		? free((void *)ptr), NULL : NULL))
 	{
 	    switch (tag) {
 	    case RPMSIGTAG_PGP5:	/* XXX legacy */
@@ -423,7 +424,7 @@ l = malloc(sizeof(*l));
 	headerFreeIterator(sigIter);
 	res += res2;
 	unlink(sigtarget);
-	xfree(sigtarget);	sigtarget = NULL;
+	free((void *)sigtarget);	sigtarget = NULL;
 
 	if (res2) {
 	    if (rpmIsVerbose()) {
@@ -459,7 +460,7 @@ l = malloc(sizeof(*l));
 	if (ofd)	manageFile(&ofd, NULL, 0, 0);
 	if (sigtarget) {
 	    unlink(sigtarget);
-	    xfree(sigtarget);	sigtarget = NULL;
+	    free((void *)sigtarget);	sigtarget = NULL;
 	}
     }
 if (l != &lead) free(l);
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 93c2ef2cf..dfd7207be 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -12,21 +12,21 @@ static int _debug = 0;
 #include <sys/signal.h>
 
 #include <rpmlib.h>
-#include <rpmurl.h>	/* XXX for assert.h */
 #include <rpmmacro.h>	/* XXX for rpmGetPath/rpmGenPath */
 
 #include "rpmdb.h"
+#include "fprint.h"
+#include "misc.h"
+#include "debug.h"
 
 /*@access dbiIndexSet@*/
 /*@access dbiIndexItem@*/
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access rpmdbMatchIterator@*/
 
-#include "fprint.h"
-#include "misc.h"
-
 extern int _noDirTokens;
 static int _rebuildinprogress = 0;
+static int _db_filter_dups = 0;
 
 int _filterDbDups = 0;	/* Filter duplicate entries ? (bug in pre rpm-3.0.4) */
 
@@ -68,7 +68,7 @@ static void dbiTagsInit(void)
 
     dbiTagStr = rpmExpand("%{_dbi_tags}", NULL);
     if (!(dbiTagStr && *dbiTagStr && *dbiTagStr != '%')) {
-	xfree(dbiTagStr);
+	free((void *)dbiTagStr);
 	dbiTagStr = xstrdup(_dbiTagStr_default);
     }
 
@@ -709,19 +709,19 @@ int rpmdbClose (rpmdb rpmdb)
     	rpmdb->_dbi[dbix] = NULL;
     }
     if (rpmdb->db_errpfx) {
-	xfree(rpmdb->db_errpfx);
+	free((void *)rpmdb->db_errpfx);
 	rpmdb->db_errpfx = NULL;
     }
     if (rpmdb->db_root) {
-	xfree(rpmdb->db_root);
+	free((void *)rpmdb->db_root);
 	rpmdb->db_root = NULL;
     }
     if (rpmdb->db_home) {
-	xfree(rpmdb->db_home);
+	free((void *)rpmdb->db_home);
 	rpmdb->db_home = NULL;
     }
     if (rpmdb->_dbi) {
-	xfree(rpmdb->_dbi);
+	free((void *)rpmdb->_dbi);
 	rpmdb->_dbi = NULL;
     }
     free(rpmdb);
@@ -1295,11 +1295,11 @@ void rpmdbFreeIterator(rpmdbMatchIterator mi)
     }
 
     if (mi->mi_release) {
-	xfree(mi->mi_release);
+	free((void *)mi->mi_release);
 	mi->mi_release = NULL;
     }
     if (mi->mi_version) {
-	xfree(mi->mi_version);
+	free((void *)mi->mi_version);
 	mi->mi_version = NULL;
     }
     if (mi->mi_dbc) {
@@ -1311,7 +1311,7 @@ void rpmdbFreeIterator(rpmdbMatchIterator mi)
 	mi->mi_set = NULL;
     }
     if (mi->mi_keyp) {
-	xfree(mi->mi_keyp);
+	free((void *)mi->mi_keyp);
 	mi->mi_keyp = NULL;
     }
     free(mi);
@@ -1345,7 +1345,7 @@ void rpmdbSetIteratorRelease(rpmdbMatchIterator mi, const char * release) {
     if (mi == NULL)
 	return;
     if (mi->mi_release) {
-	xfree(mi->mi_release);
+	free((void *)mi->mi_release);
 	mi->mi_release = NULL;
     }
     mi->mi_release = (release ? xstrdup(release) : NULL);
@@ -1355,7 +1355,7 @@ void rpmdbSetIteratorVersion(rpmdbMatchIterator mi, const char * version) {
     if (mi == NULL)
 	return;
     if (mi->mi_version) {
-	xfree(mi->mi_version);
+	free((void *)mi->mi_version);
 	mi->mi_version = NULL;
     }
     mi->mi_version = (version ? xstrdup(version) : NULL);
@@ -1425,7 +1425,7 @@ top:
     } while (mi->mi_offset == 0);
 
     if (mi->mi_prevoffset && mi->mi_offset == mi->mi_prevoffset)
-	return mi->mi_h;
+	goto exit;
 
     /* Retrieve next header */
     if (uh == NULL) {
@@ -1460,6 +1460,16 @@ top:
 
     mi->mi_prevoffset = mi->mi_offset;
     mi->mi_modified = 0;
+
+exit:
+#ifdef	NOTNOW
+    if (mi->mi_h) {
+	const char *n, *v, *r;
+	headerNVR(mi->mi_h, &n, &v, &r);
+	rpmMessage(RPMMESS_DEBUG, "%s-%s-%s at 0x%x, h %p\n", n, v, r,
+		mi->mi_offset, mi->mi_h);
+    }
+#endif
     return mi->mi_h;
 }
 
@@ -1774,7 +1784,7 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int hdrNum)
 	    switch (rpmtype) {
 	    case RPM_STRING_ARRAY_TYPE:
 	    case RPM_I18NSTRING_TYPE:
-		xfree(rpmvals);
+		free((void *)rpmvals);
 		rpmvals = NULL;
 		break;
 	    }
@@ -1994,7 +2004,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
 		case RPMTAG_REQUIRENAME:
 		    /* Filter out install prerequisites. */
 		    if (requireFlags && isInstallPreReq(requireFlags[i])) {
-		rpmMessage(RPMMESS_DEBUG, ("%6d %s\n"), i, rpmvals[i]);
+		rpmMessage(RPMMESS_DEBUG, ("%6d %s (install prerequisite) skipped\n"), i, rpmvals[i]);
 			continue;
 		    }
 		    rec->tagNum = i;
@@ -2027,7 +2037,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
 	    switch (rpmtype) {
 	    case RPM_STRING_ARRAY_TYPE:
 	    case RPM_I18NSTRING_TYPE:
-		xfree(rpmvals);
+		free((void *)rpmvals);
 		rpmvals = NULL;
 		break;
 	    }
@@ -2197,7 +2207,7 @@ static int rpmdbRemoveDatabase(const char * rootdir,
 	    sprintf(filename, "%s/%s/%s", rootdir, dbpath, base);
 	    (void)rpmCleanPath(filename);
 	    xx = unlink(filename);
-	    xfree(base);
+	    free((void *)base);
 	}
 	break;
     }
@@ -2306,7 +2316,7 @@ static int rpmdbMoveDatabase(const char * rootdir,
 	    (void)rpmCleanPath(nfilename);
 	    if ((xx = Rename(ofilename, nfilename)) != 0)
 		rc = 1;
-	    xfree(base);
+	    free((void *)base);
 	}
 	break;
     }
@@ -2345,7 +2355,7 @@ int rpmdbRebuild(const char * rootdir)
     dbpath = rootdbpath = rpmGetPath(rootdir, tfn, NULL);
     if (!(rootdir[0] == '/' && rootdir[1] == '\0'))
 	dbpath += strlen(rootdir);
-    xfree(tfn);
+    free((void *)tfn);
 
     tfn = rpmGetPath("%{_dbpath_rebuild}", NULL);
     if (!(tfn && tfn[0] != '%' && strcmp(tfn, dbpath))) {
@@ -2354,14 +2364,14 @@ int rpmdbRebuild(const char * rootdir)
 	sprintf(pidbuf, "rebuilddb.%d", (int) getpid());
 	t = xmalloc(strlen(dbpath) + strlen(pidbuf) + 1);
 	(void)stpcpy(stpcpy(t, dbpath), pidbuf);
-	if (tfn) xfree(tfn);
+	if (tfn) free((void *)tfn);
 	tfn = t;
 	nocleanup = 0;
     }
     newdbpath = newrootdbpath = rpmGetPath(rootdir, tfn, NULL);
     if (!(rootdir[0] == '/' && rootdir[1] == '\0'))
 	newdbpath += strlen(rootdir);
-    xfree(tfn);
+    free((void *)tfn);
 
     rpmMessage(RPMMESS_DEBUG, _("rebuilding database %s into %s\n"),
 	rootdbpath, newrootdbpath);
@@ -2422,7 +2432,7 @@ int rpmdbRebuild(const char * rootdir)
 	    }
 
 	    /* Filter duplicate entries ? (bug in pre rpm-3.0.4) */
-	    if (newdb->db_filter_dups) {
+	    if (_db_filter_dups || newdb->db_filter_dups) {
 		const char * name, * version, * release;
 		int skip = 0;
 
@@ -2443,10 +2453,15 @@ int rpmdbRebuild(const char * rootdir)
 		    continue;
 	    }
 
-	    /* Retrofit "Provide: name = EVR" for binary packages. */
-	    providePackageNVR(h);
+	    /* Deleted entries are eliminated in legacy headers by copy. */
+	    {	Header nh = (headerIsEntry(h, RPMTAG_HEADERIMAGE)
+				? headerCopy(h) : NULL);
+		rc = rpmdbAdd(newdb, (nh ? nh : h));
+		if (nh)
+		    headerFree(nh);
+	    }
 
-	    if (rpmdbAdd(newdb, h)) {
+	    if (rc) {
 		rpmError(RPMERR_INTERNAL,
 			_("cannot add record originally at %d"), _RECNUM);
 		failed = 1;
@@ -2491,8 +2506,8 @@ exit:
 	    rpmMessage(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
 			newrootdbpath, strerror(errno));
     }
-    if (newrootdbpath)	xfree(newrootdbpath);
-    if (rootdbpath)	xfree(rootdbpath);
+    if (newrootdbpath)	free((void *)newrootdbpath);
+    if (rootdbpath)	free((void *)rootdbpath);
 
     return rc;
 }
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index bfcd4fcec..6e9e6f2da 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -9,6 +9,7 @@
 #include <rpmurl.h>
 
 #include "misc.h"
+#include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access FD_t@*/		/* XXX compared with NULL */
@@ -259,15 +260,15 @@ int rpmInstall(const char * rootdir, const char ** fileArgv,
 			argv[j], ftpStrerror(myrc));
 		    numFailed++;
 		    pkgURL[i] = NULL;
-		    xfree(tfn);
+		    free((void *)tfn);
 		} else {
 		    tmppkgURL[numTmpPkgs++] = pkgURL[i++] = tfn;
 		}
 	    }
 	    if (argv) {
 		for (j = 0; j < argc; j++)
-		    xfree(argv[j]);
-		xfree(argv);
+		    free((void *)argv[j]);
+		free((void *)argv);
 		argv = NULL;
 	    }
 	}   break;
@@ -328,7 +329,7 @@ int rpmInstall(const char * rootdir, const char ** fileArgv,
 					"%{_dbpath}", NULL);
 			rpmMessage(RPMMESS_ERROR, 
 				_("cannot open Packages database in %s\n"), dn);
-			xfree(dn);
+			free((void *)dn);
 			exit(EXIT_FAILURE);
 		    }
 		    rpmdep = rpmtransCreateSet(db, rootdir);
@@ -342,7 +343,7 @@ int rpmInstall(const char * rootdir, const char ** fileArgv,
 		    if (headerGetEntry(h, RPMTAG_PREFIXES, NULL,
 				       (void **) &paths, &c) && (c == 1)) {
 			defaultReloc->oldPath = xstrdup(paths[0]);
-			xfree(paths);
+			free((void *)paths);
 		    } else {
 			const char * name;
 			headerNVR(h, &name, NULL, NULL);
@@ -404,7 +405,7 @@ int rpmInstall(const char * rootdir, const char ** fileArgv,
 		}
 
 		if (defaultReloc) {
-		    xfree(defaultReloc->oldPath);
+		    free((void *)defaultReloc->oldPath);
 		    defaultReloc->oldPath = NULL;
 		}
 
@@ -482,10 +483,10 @@ int rpmInstall(const char * rootdir, const char ** fileArgv,
 
     for (i = 0; i < numTmpPkgs; i++) {
 	Unlink(tmppkgURL[i]);
-	xfree(tmppkgURL[i]);
+	free((void *)tmppkgURL[i]);
     }
-    xfree(tmppkgURL);	tmppkgURL = NULL;
-    xfree(pkgURL);	pkgURL = NULL;
+    free((void *)tmppkgURL);	tmppkgURL = NULL;
+    free((void *)pkgURL);	pkgURL = NULL;
 
     /* FIXME how do we close our various fd's? */
 
@@ -496,11 +497,11 @@ int rpmInstall(const char * rootdir, const char ** fileArgv,
 errxit:
     if (tmppkgURL) {
 	for (i = 0; i < numTmpPkgs; i++)
-	    xfree(tmppkgURL[i]);
-	xfree(tmppkgURL);
+	    free((void *)tmppkgURL[i]);
+	free((void *)tmppkgURL);
     }
     if (pkgURL)
-	xfree(pkgURL);
+	free((void *)pkgURL);
     if (dbIsOpen) rpmdbClose(db);
     return numPkgs;
 }
@@ -530,7 +531,7 @@ int rpmErase(const char * rootdir, const char ** argv,
 	const char *dn;
 	dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL);
 	rpmMessage(RPMMESS_ERROR, _("cannot open %s/packages.rpm\n"), dn);
-	xfree(dn);
+	free((void *)dn);
 	exit(EXIT_FAILURE);
     }
 
@@ -609,7 +610,7 @@ int rpmInstallSource(const char * rootdir, const char * arg,
     if (rc == 1) {
 	rpmMessage(RPMMESS_ERROR, _("%s cannot be installed\n"), arg);
 	if (specFile && *specFile) {
-	    xfree(*specFile);
+	    free((void *)*specFile);
 	    *specFile = NULL;
 	}
 	if (cookie && *cookie) {
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 7d55a7923..dda7e96c6 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -8,18 +8,14 @@
 # include <machine/types.h>
 #endif
 
-#ifdef	__LCLINT__
-#define	ntohl(_x)	(_x)
-#define	ntohs(_x)	(_x)
-#define	htonl(_x)	(_x)
-#define	htons(_x)	(_x)
-#else
+#if !defined(__LCLINT__)
 #include <netinet/in.h>
 #endif	/* __LCLINT__ */
 
 #include <rpmlib.h>
 
 #include "rpmlead.h"
+#include "debug.h"
 
 /* The lead needs to be 8 byte aligned */
 
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 541d1afaf..b8070e0ff 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -731,9 +731,10 @@ typedef enum rpmProblemType_e {
 /**
  */
 typedef /*@abstract@*/ struct rpmProblem_s {
-    Header h;
-    Header altH;
+/*@only@*/ /*@null@*/ const char * pkgNEVR;
+/*@only@*/ /*@null@*/ const char * altNEVR;
 /*@dependent@*/ const void * key;
+    Header h;
     rpmProblemType type;
     int ignoreProblem;
 /*@only@*/ const char * str1;
@@ -908,6 +909,18 @@ void rpmtransSetScriptFd(rpmTransactionSet ts, FD_t fd)
 	/*@modifies ts, fd @*/;
 
 /** \ingroup rpmtrans
+ * Retrieve keys from ordered transaction set.
+ * @todo Removed packages have no keys, returned as interleaved NULL pointers.
+ * @param ts		rpm transaction set
+ * @retval ep		address of returned element array pointer (or NULL)
+ * @retval nep		address of no. of returned elements (or NULL)
+ * @return		0 always
+ */
+int rpmtransGetKeys(const rpmTransactionSet ts,
+	/*@out@*/ const void *** ep, /*@out@*/ int * nep)
+		/*@modifies ep, nep @*/;
+
+/** \ingroup rpmtrans
  * Check that all dependencies can be resolved.
  * @param rpmdep	rpm transaction set
  * @retval conflicts
diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c
index e11509836..6c201b050 100644
--- a/lib/rpmlibprov.c
+++ b/lib/rpmlibprov.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include "debug.h"
 
 static struct rpmlibProvides {
     const char * featureName;
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 188529f44..187721402 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -12,6 +12,7 @@
 #include <rpmmacro.h>
 
 #include "misc.h"
+#include "debug.h"
 
 static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc";
 
@@ -166,8 +167,8 @@ static int machCompatCacheAdd(char * name, const char * fn, int linenum,
 	entry = machCacheFindEntry(cache, name);
 	if (entry) {
 	    for (i = 0; i < entry->count; i++)
-		xfree(entry->equivs[i]);
-	    xfree(entry->equivs);
+		free((void *)entry->equivs[i]);
+	    free((void *)entry->equivs);
 	    entry->equivs = NULL;
 	    entry->count = 0;
 	}
@@ -271,11 +272,11 @@ static void machFindEquivs(struct machCache * cache,
 	cache->cache[i].visited = 0;
 
     while (table->count > 0) {
-	xfree(table->list[--table->count].name);
+	free((void *)table->list[--table->count].name);
 	table->list[table->count].name = NULL;
     }
     table->count = 0;
-    if (table->list) xfree(table->list);
+    if (table->list) free((void *)table->list);
     table->list = NULL;
 
     /*
@@ -413,8 +414,8 @@ int rpmReadConfigFiles(const char * file, const char * target)
     {	const char *cpu = rpmExpand("%{_target_cpu}", NULL);
 	const char *os = rpmExpand("%{_target_os}", NULL);
 	rpmSetMachine(cpu, os);
-	xfree(cpu);
-	xfree(os);
+	free((void *)cpu);
+	free((void *)os);
     }
 
     return 0;
@@ -449,7 +450,7 @@ static void setPathDefault(int var, const char *macroname, const char *subdir)
 	strcat(fn, subdir);
 
 	rpmSetVar(var, fn);
-	if (topdir)	xfree(topdir);
+	if (topdir)	free((void *)topdir);
     }
 
     if (macroname != NULL) {
@@ -591,7 +592,7 @@ int rpmReadRC(const char * rcfiles)
 	if ((macrofiles = rpmGetVar(RPMVAR_MACROFILES)) != NULL) {
 	    macrofiles = strdup(macrofiles);
 	    rpmInitMacros(NULL, macrofiles);
-	    xfree(macrofiles);
+	    free((void *)macrofiles);
 	}
     }
 
@@ -690,7 +691,7 @@ static int doReadRC( /*@killref@*/ FD_t fd, const char * urlfn)
 		if (fn == NULL || *fn == '\0') {
 		    rpmError(RPMERR_RPMRC, _("%s expansion failed at %s:%d \"%s\""),
 			option->name, urlfn, linenum, s);
-		    if (fn) xfree(fn);
+		    if (fn) free((void *)fn);
 		    return 1;
 		    /*@notreached@*/
 		}
@@ -703,7 +704,7 @@ static int doReadRC( /*@killref@*/ FD_t fd, const char * urlfn)
 		} else {
 		    rc = doReadRC(fdinc, fn);
 		}
-		if (fn) xfree(fn);
+		if (fn) free((void *)fn);
 		if (rc) return rc;
 		continue;	/* XXX don't save include value as var/macro */
 	      }	/*@notreached@*/ break;
@@ -712,7 +713,7 @@ static int doReadRC( /*@killref@*/ FD_t fd, const char * urlfn)
 		if (fn == NULL || *fn == '\0') {
 		    rpmError(RPMERR_RPMRC, _("%s expansion failed at %s:%d \"%s\""),
 			option->name, urlfn, linenum, fn);
-		    if (fn) xfree(fn);
+		    if (fn) free((void *)fn);
 		    return 1;
 		}
 		se = (char *)fn;
@@ -765,7 +766,7 @@ static int doReadRC( /*@killref@*/ FD_t fd, const char * urlfn)
 		free(name);
 	    }
 	    rpmSetVarArch(option->var, val, arch);
-	    if (fn) xfree(fn);
+	    if (fn) free((void *)fn);
 
 	} else {	/* For arch/os compatibilty tables ... */
 	    int gotit;
@@ -1048,11 +1049,11 @@ static void freeRpmVar(struct rpmvarValue * orig) {
     while (var) {
 	next = var->next;
 	if (var->arch) {
-	    xfree(var->arch);
+	    free((void *)var->arch);
 	    var->arch = NULL;
 	}
 	if (var->value) {
-	    xfree(var->value);
+	    free((void *)var->value);
 	    var->value = NULL;
 	}
 
@@ -1083,8 +1084,8 @@ static void rpmSetVarArch(int var, const char * val, const char * arch) {
 	}
 
 	if (next->arch && arch && !strcmp(next->arch, arch)) {
-	    if (next->value) xfree(next->value);
-	    if (next->arch) xfree(next->arch);
+	    if (next->value) free((void *)next->value);
+	    if (next->arch) free((void *)next->arch);
 	} else if (next->arch || arch) {
 	    next->next = xmalloc(sizeof(*next->next));
 	    next = next->next;
@@ -1150,14 +1151,14 @@ void rpmSetMachine(const char * arch, const char * os) {
     }
 
     if (!current[ARCH] || strcmp(arch, current[ARCH])) {
-	if (current[ARCH]) xfree(current[ARCH]);
+	if (current[ARCH]) free((void *)current[ARCH]);
 	current[ARCH] = xstrdup(arch);
 	rebuildCompatTables(ARCH, host_cpu);
     }
 
     if (!current[OS] || strcmp(os, current[OS])) {
 	char * t = xstrdup(os);
-	if (current[OS]) xfree(current[OS]);
+	if (current[OS]) free((void *)current[OS]);
 	/*
 	 * XXX Capitalizing the 'L' is needed to insure that old
 	 * XXX os-from-uname (e.g. "Linux") is compatible with the new
@@ -1316,9 +1317,9 @@ void rpmFreeRpmrc(void)
 	t = tables + i;
 	if (t->equiv.list) {
 	    for (j = 0; j < t->equiv.count; j++) {
-		if (t->equiv.list[j].name)	xfree(t->equiv.list[j].name);
+		if (t->equiv.list[j].name) free((void *)t->equiv.list[j].name);
 	    }
-	    xfree(t->equiv.list);
+	    free((void *)t->equiv.list);
 	    t->equiv.list = NULL;
 	    t->equiv.count = 0;
 	}
@@ -1327,33 +1328,33 @@ void rpmFreeRpmrc(void)
 		struct machCacheEntry *e;
 		e = t->cache.cache + j;
 		if (e == NULL)	continue;
-		if (e->name)		xfree(e->name);
+		if (e->name)		free((void *)e->name);
 		if (e->equivs) {
 		    for (k = 0; k < e->count; k++) {
-			if (e->equivs[k])	xfree(e->equivs[k]);
+			if (e->equivs[k])	free((void *)e->equivs[k]);
 		    }
-		    xfree(e->equivs);
+		    free((void *)e->equivs);
 		}
 	    }
-	    xfree(t->cache.cache);
+	    free((void *)t->cache.cache);
 	    t->cache.cache = NULL;
 	    t->cache.size = 0;
 	}
 	if (t->defaults) {
 	    for (j = 0; j < t->defaultsLength; j++) {
-		if (t->defaults[j].name)	xfree(t->defaults[j].name);
-		if (t->defaults[j].defName)	xfree(t->defaults[j].defName);
+		if (t->defaults[j].name) free((void *)t->defaults[j].name);
+		if (t->defaults[j].defName) free((void *)t->defaults[j].defName);
 	    }
-	    xfree(t->defaults);
+	    free((void *)t->defaults);
 	    t->defaults = NULL;
 	    t->defaultsLength = 0;
 	}
 	if (t->canons) {
 	    for (j = 0; j < t->canonsLength; j++) {
-		if (t->canons[j].name)		xfree(t->canons[j].name);
-		if (t->canons[j].short_name)	xfree(t->canons[j].short_name);
+		if (t->canons[j].name)	free((void *)t->canons[j].name);
+		if (t->canons[j].short_name)	free((void *)t->canons[j].short_name);
 	    }
-	    xfree(t->canons);
+	    free((void *)t->canons);
 	    t->canons = NULL;
 	    t->canonsLength = 0;
 	}
@@ -1363,22 +1364,22 @@ void rpmFreeRpmrc(void)
 	struct rpmvarValue *this;
 	while ((this = values[i].next) != NULL) {
 	    values[i].next = this->next;
-	    if (this->value)	xfree(this->value);
-	    if (this->arch)	xfree(this->arch);
-	    xfree(this);
+	    if (this->value)	free((void *)this->value);
+	    if (this->arch)	free((void *)this->arch);
+	    free((void *)this);
 	}
 	if (values[i].value)
-	    xfree(values[i].value);
+	    free((void *)values[i].value);
 	values[i].value = NULL;
 	if (values[i].arch)
-	    xfree(values[i].arch);
+	    free((void *)values[i].arch);
 	values[i].arch = NULL;
     }
     if (current[OS])
-	xfree(current[OS]);
+	free((void *)current[OS]);
     current[OS] = NULL;
     if (current[ARCH])
-	xfree(current[ARCH]);
+	free((void *)current[ARCH]);
     current[ARCH] = NULL;
     defaultsInitialized = 0;
     return;
diff --git a/lib/signature.c b/lib/signature.c
index b33d04fef..3887c1c18 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -24,6 +24,7 @@
 #include "misc.h"
 #include "rpmlead.h"
 #include "signature.h"
+#include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
 
@@ -60,7 +61,7 @@ int rpmLookupSignatureType(int action)
 	    rc = RPMSIGTAG_GPG;
 	else
 	    rc = -1;	/* Invalid %_signature spec in macro file */
-	xfree(name);
+	free((void *)name);
       }	break;
     }
     return rc;
@@ -80,19 +81,19 @@ const char * rpmDetectPGPVersion(pgpVersion *pgpVer)
 
     if (saved_pgp_version == PGP_UNKNOWN) {
 	char *pgpvbin;
-	struct stat statbuf;
+	struct stat st;
 	
 	if (!(pgpbin && pgpbin[0] != '%')) {
-	  if (pgpbin) xfree(pgpbin);
+	  if (pgpbin) free((void *)pgpbin);
 	  saved_pgp_version = -1;
 	  return NULL;
 	}
 	pgpvbin = (char *)alloca(strlen(pgpbin) + sizeof("v"));
 	(void)stpcpy(stpcpy(pgpvbin, pgpbin), "v");
 
-	if (stat(pgpvbin, &statbuf) == 0)
+	if (stat(pgpvbin, &st) == 0)
 	  saved_pgp_version = PGP_5;
-	else if (stat(pgpbin, &statbuf) == 0)
+	else if (stat(pgpbin, &st) == 0)
 	  saved_pgp_version = PGP_2;
 	else
 	  saved_pgp_version = PGP_NOTDETECTED;
@@ -103,28 +104,28 @@ const char * rpmDetectPGPVersion(pgpVersion *pgpVer)
     return pgpbin;
 }
 
-static int checkSize(FD_t fd, int size, int sigsize)
+static inline int checkSize(FD_t fd, int siglen, int pad, int datalen)
 {
-    int headerArchiveSize;
-    struct stat statbuf;
+    struct stat st;
 
-    fstat(Fileno(fd), &statbuf);
+    fstat(Fileno(fd), &st);
 
-    if (S_ISREG(statbuf.st_mode)) {
-	headerArchiveSize = statbuf.st_size - sizeof(struct rpmlead) - sigsize;
-
-	rpmMessage(RPMMESS_DEBUG, _("sigsize         : %d\n"), sigsize);
-	rpmMessage(RPMMESS_DEBUG, _("Header + Archive: %d\n"), headerArchiveSize);
-	rpmMessage(RPMMESS_DEBUG, _("expected size   : %d\n"), size);
-
-	return size - headerArchiveSize;
-    } else {
-	rpmMessage(RPMMESS_DEBUG, _("file is not regular -- skipping size check\n"));
+    if (!S_ISREG(st.st_mode)) {
+	rpmMessage(RPMMESS_DEBUG,
+	    _("file is not regular -- skipping size check\n"));
 	return 0;
     }
+    rpmMessage(RPMMESS_DEBUG,
+	_("Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"),
+		sizeof(struct rpmlead)+siglen+pad+datalen,
+		sizeof(struct rpmlead), siglen, pad, datalen);
+    rpmMessage(RPMMESS_DEBUG,
+	_("  Actual size: %12d\n"), st.st_size);
+
+    return ((sizeof(struct rpmlead) + siglen + pad + datalen) - st.st_size);
 }
 
-int rpmReadSignature(FD_t fd, Header *headerp, short sig_type)
+int rpmReadSignature(FD_t fd, Header *headerp, short sigType)
 {
     byte buf[2048];
     int sigSize, pad;
@@ -136,7 +137,7 @@ int rpmReadSignature(FD_t fd, Header *headerp, short sig_type)
     if (headerp)
 	*headerp = NULL;
     
-    switch (sig_type) {
+    switch (sigType) {
       case RPMSIG_NONE:
 	rpmMessage(RPMMESS_DEBUG, _("No signature\n"));
 	rc = 0;
@@ -156,7 +157,6 @@ int rpmReadSignature(FD_t fd, Header *headerp, short sig_type)
 	      _("Old (internal-only) signature!  How did you get that!?"));
 	break;
       case RPMSIG_HEADERSIG:
-	rpmMessage(RPMMESS_DEBUG, _("New Header signature\n"));
 	/* This is a new style signature */
 	h = headerRead(fd, HEADER_MAGIC_YES);
 	if (h == NULL)
@@ -166,13 +166,15 @@ int rpmReadSignature(FD_t fd, Header *headerp, short sig_type)
 	/* XXX Legacy headers have a HEADER_IMAGE tag added. */
 	if (headerIsEntry(h, RPMTAG_HEADERIMAGE))
 	    sigSize -= (16 + 16);
+#if 0
+	if (headerIsEntry(h, RPMTAG_HEADERSIGNATURES))
+	    sigSize -= 16;
+#endif
 
 	pad = (8 - (sigSize % 8)) % 8; /* 8-byte pad */
-	rpmMessage(RPMMESS_DEBUG, _("Signature size: %d\n"), sigSize);
-	rpmMessage(RPMMESS_DEBUG, _("Signature pad : %d\n"), pad);
 	if (! headerGetEntry(h, RPMSIGTAG_SIZE, &type, (void **)&archSize, &count))
 	    break;
-	if (checkSize(fd, *archSize, sigSize + pad))
+	if (checkSize(fd, sigSize, pad, *archSize))
 	    break;
 	if (pad) {
 	    if (timedRead(fd, buf, pad) != pad)
@@ -230,7 +232,7 @@ static int makePGPSignature(const char *file, /*@out@*/void **sig, /*@out@*/int_
     char sigfile[1024];
     int pid, status;
     int inpipe[2];
-    struct stat statbuf;
+    struct stat st;
 
     sprintf(sigfile, "%s.sig", file);
 
@@ -283,14 +285,14 @@ static int makePGPSignature(const char *file, /*@out@*/void **sig, /*@out@*/int_
 	return 1;
     }
 
-    if (stat(sigfile, &statbuf)) {
+    if (stat(sigfile, &st)) {
 	/* PGP failed to write signature */
 	unlink(sigfile);  /* Just in case */
 	rpmError(RPMERR_SIGGEN, _("pgp failed to write signature"));
 	return 1;
     }
 
-    *size = statbuf.st_size;
+    *size = st.st_size;
     rpmMessage(RPMMESS_DEBUG, _("PGP sig size: %d\n"), *size);
     *sig = xmalloc(*size);
     
@@ -324,7 +326,7 @@ static int makeGPGSignature(const char *file, /*@out@*/void **sig, /*@out@*/int_
     int pid, status;
     int inpipe[2];
     FILE *fpipe;
-    struct stat statbuf;
+    struct stat st;
 
     sprintf(sigfile, "%s.sig", file);
 
@@ -360,14 +362,14 @@ static int makeGPGSignature(const char *file, /*@out@*/void **sig, /*@out@*/int_
 	return 1;
     }
 
-    if (stat(sigfile, &statbuf)) {
+    if (stat(sigfile, &st)) {
 	/* GPG failed to write signature */
 	unlink(sigfile);  /* Just in case */
 	rpmError(RPMERR_SIGGEN, _("gpg failed to write signature"));
 	return 1;
     }
 
-    *size = statbuf.st_size;
+    *size = st.st_size;
     rpmMessage(RPMMESS_DEBUG, _("GPG sig size: %d\n"), *size);
     *sig = xmalloc(*size);
     
@@ -391,7 +393,7 @@ static int makeGPGSignature(const char *file, /*@out@*/void **sig, /*@out@*/int_
 
 int rpmAddSignature(Header header, const char *file, int_32 sigTag, const char *passPhrase)
 {
-    struct stat statbuf;
+    struct stat st;
     int_32 size;
     byte buf[16];
     void *sig;
@@ -399,8 +401,8 @@ int rpmAddSignature(Header header, const char *file, int_32 sigTag, const char *
     
     switch (sigTag) {
     case RPMSIGTAG_SIZE:
-	stat(file, &statbuf);
-	size = statbuf.st_size;
+	stat(file, &st);
+	size = st.st_size;
 	ret = 0;
 	headerAddEntry(header, RPMSIGTAG_SIZE, RPM_INT32_TYPE, &size, 1);
 	break;
@@ -430,13 +432,13 @@ int rpmAddSignature(Header header, const char *file, int_32 sigTag, const char *
 static rpmVerifySignatureReturn
 verifySizeSignature(const char *datafile, int_32 size, char *result)
 {
-    struct stat statbuf;
+    struct stat st;
 
-    stat(datafile, &statbuf);
-    if (size != statbuf.st_size) {
+    stat(datafile, &st);
+    if (size != st.st_size) {
 	sprintf(result, "Header+Archive size mismatch.\n"
 		"Expected %d, saw %d.\n",
-		size, (int)statbuf.st_size);
+		size, (int)st.st_size);
 	return RPMSIG_BAD;
     }
 
@@ -510,7 +512,7 @@ verifyPGPSignature(const char *datafile, const void * sig, int count, char *resu
     /* Write out the signature */
   { const char *tmppath = rpmGetPath("%{_tmppath}", NULL);
     sigfile = tempnam(tmppath, "rpmsig");
-    xfree(tmppath);
+    free((void *)tmppath);
   }
     sfd = Fopen(sigfile, "w.fdio");
     (void)Fwrite(sig, sizeof(char), count, sfd);
@@ -605,7 +607,7 @@ verifyGPGSignature(const char *datafile, const void * sig, int count, char *resu
     /* Write out the signature */
   { const char *tmppath = rpmGetPath("%{_tmppath}", NULL);
     sigfile = tempnam(tmppath, "rpmsig");
-    xfree(tmppath);
+    free((void *)tmppath);
   }
     sfd = Fopen(sigfile, "w.fdio");
     (void)Fwrite(sig, sizeof(char), count, sfd);
@@ -752,7 +754,7 @@ char *rpmGetPassPhrase(const char *prompt, const int sigTag)
     case RPMSIGTAG_GPG:
       { const char *name = rpmExpand("%{_gpg_name}", NULL);
 	aok = (name && *name != '%');
-	xfree(name);
+	free((void *)name);
       }
 	if (!aok) {
 	    rpmError(RPMERR_SIGGEN,
@@ -764,7 +766,7 @@ char *rpmGetPassPhrase(const char *prompt, const int sigTag)
     case RPMSIGTAG_PGP: 
       { const char *name = rpmExpand("%{_pgp_name}", NULL);
 	aok = (name && *name != '%');
-	xfree(name);
+	free((void *)name);
       }
 	if (!aok) {
 	    rpmError(RPMERR_SIGGEN,
diff --git a/lib/stringbuf.c b/lib/stringbuf.c
index afd223e77..3c3d3ff78 100644
--- a/lib/stringbuf.c
+++ b/lib/stringbuf.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include "stringbuf.h"
+#include "debug.h"
 
 #define BUF_CHUNK 1024
 
diff --git a/lib/tagName.c b/lib/tagName.c
index 365db28f9..38cd8ead9 100644
--- a/lib/tagName.c
+++ b/lib/tagName.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include "debug.h"
 
 const char *const tagName(int tag)
 {
diff --git a/lib/test.c b/lib/test.c
index 6ba81877b..b0a4c3534 100644
--- a/lib/test.c
+++ b/lib/test.c
@@ -1,6 +1,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include "debug.h"
 
 void main(int argc, char **argv)
 {
diff --git a/lib/transaction.c b/lib/transaction.c
index b99bb2bc6..14b123261 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -33,6 +33,8 @@
 # endif
 #endif
 
+#include "debug.h"
+
 /*@access FD_t@*/		/* XXX compared with NULL */
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access dbiIndexSet@*/
@@ -127,7 +129,7 @@ static void freeFi(TFI_t *fi)
 		free(fi->fstates); fi->fstates = NULL;
 	    }
 	    if (fi->dil) {
-		xfree(fi->dil); fi->dil = NULL;
+		free((void *)fi->dil); fi->dil = NULL;
 	    }
 	    break;
 	case TR_ADDED:
@@ -150,6 +152,32 @@ void rpmtransSetScriptFd(rpmTransactionSet ts, FD_t fd)
     ts->scriptFd = (fd ? fdLink(fd, "rpmtransSetScriptFd") : NULL);
 }
 
+int rpmtransGetKeys(const rpmTransactionSet ts, const void *** ep, int * nep)
+{
+    int rc = 0;
+
+    if (nep) *nep = ts->orderCount;
+    if (ep) {
+	const void ** e;
+	int oc;
+
+	*ep = e = xmalloc(ts->orderCount * sizeof(*e));
+	for (oc = 0; oc < ts->orderCount; oc++, e++) {
+	    struct availablePackage * alp;
+	    switch (ts->order[oc].type) {
+	    case TR_ADDED:
+		alp = ts->addedPackages.list + ts->order[oc].u.addedIndex;
+		*e = alp->key;
+		break;
+	    case TR_REMOVED:
+		*e = NULL;
+		break;
+	    }
+	}
+    }
+    return rc;
+}
+
 static rpmProblemSet psCreate(void)
 {
     rpmProblemSet probs;
@@ -162,9 +190,14 @@ static rpmProblemSet psCreate(void)
 }
 
 static void psAppend(rpmProblemSet probs, rpmProblemType type,
-		/*@dependent@*/ const void * key, Header h, const char * str1,
+		/*@dependent@*/ const void * key, Header h,
+		const char * dn, const char *bn,
 		Header altH, unsigned long ulong1)
 {
+    const char *n, *v, *r;
+    char *t;
+    rpmProblem p;
+
     if (probs->numProblems == probs->numProblemsAlloced) {
 	if (probs->numProblemsAlloced)
 	    probs->numProblemsAlloced *= 2;
@@ -174,24 +207,46 @@ static void psAppend(rpmProblemSet probs, rpmProblemType type,
 			probs->numProblemsAlloced * sizeof(*probs->probs));
     }
 
-    probs->probs[probs->numProblems].type = type;
-    probs->probs[probs->numProblems].key = key;
-    probs->probs[probs->numProblems].h = headerLink(h);
-    probs->probs[probs->numProblems].ulong1 = ulong1;
-    probs->probs[probs->numProblems].str1 = (str1 ? xstrdup(str1) : NULL);
-    probs->probs[probs->numProblems].altH = (altH ? headerLink(altH) : NULL);
-    probs->probs[probs->numProblems++].ignoreProblem = 0;
-}
-
-static void psAppendFile(rpmProblemSet probs, rpmProblemType type,
-		/*@dependent@*/ const void * key, Header h,
-		const char * dirName, const char * baseName,
-		Header altH, unsigned long ulong1)
-{
-    char * str = alloca(strlen(dirName) + strlen(baseName) + 1);
+    p = probs->probs + probs->numProblems++;
+    p->type = type;
+    p->key = key;
+    p->ulong1 = ulong1;
+    p->ignoreProblem = 0;
+
+    if (dn || bn) {
+	p->str1 =
+	    t = xmalloc((dn ? strlen(dn) : 0) + (bn ? strlen(bn) : 0) + 1);
+	if (dn) t = stpcpy(t, dn);
+	if (bn) t = stpcpy(t, bn);
+    } else
+	p->str1 = NULL;
+
+    if (h) {
+	p->h = headerLink(h);
+	headerNVR(h, &n, &v, &r);
+	p->pkgNEVR =
+	    t = xmalloc(strlen(n) + strlen(v) + strlen(r) + sizeof("--"));
+	t = stpcpy(t, n);
+	t = stpcpy(t, "-");
+	t = stpcpy(t, v);
+	t = stpcpy(t, "-");
+	t = stpcpy(t, r);
+    } else {
+	p->pkgNEVR = NULL;
+	p->h = NULL;
+    }
 
-    (void) stpcpy( stpcpy(str, dirName), baseName);
-    psAppend(probs, type, key, h, str, altH, ulong1);
+    if (altH) {
+	headerNVR(altH, &n, &v, &r);
+	p->altNEVR =
+	    t = xmalloc(strlen(n) + strlen(v) + strlen(r) + sizeof("--"));
+	t = stpcpy(t, n);
+	t = stpcpy(t, "-");
+	t = stpcpy(t, v);
+	t = stpcpy(t, "-");
+	t = stpcpy(t, r);
+    } else
+	p->altNEVR = NULL;
 }
 
 static int archOkay(Header h)
@@ -253,11 +308,11 @@ void rpmProblemSetFree(rpmProblemSet probs)
     int i;
 
     for (i = 0; i < probs->numProblems; i++) {
-	headerFree(probs->probs[i].h);
-	if (probs->probs[i].str1) xfree(probs->probs[i].str1);
-	if (probs->probs[i].altH) {
-	    headerFree(probs->probs[i].altH);
-	}
+	rpmProblem p = probs->probs + i;
+	if (p->h)	headerFree(p->h);
+	if (p->pkgNEVR)	free((void *)p->pkgNEVR);
+	if (p->altNEVR)	free((void *)p->altNEVR);
+	if (p->str1) free((void *)p->str1);
     }
     free(probs);
 }
@@ -303,13 +358,17 @@ static Header relocateFileList(struct availablePackage * alp,
 	    if (!headerIsEntry(origH, RPMTAG_INSTPREFIXES))
 		headerAddEntry(origH, RPMTAG_INSTPREFIXES,
 			RPM_STRING_ARRAY_TYPE, validRelocations, numValid);
-	    xfree(validRelocations);
+	    free((void *)validRelocations);
 	}
 	/* XXX FIXME multilib file actions need to be checked. */
 	return headerLink(origH);
     }
 
+#ifdef DYING
     h = headerCopy(origH);
+#else
+    h = headerLink(origH);
+#endif
 
     if (rawRelocations) {
 	for (i = 0; rawRelocations[i].newPath || rawRelocations[i].oldPath; i++)
@@ -344,7 +403,7 @@ static Header relocateFileList(struct availablePackage * alp,
 		if (!strcmp(validRelocations[j], relocations[i].oldPath)) break;
 	    if (j == numValid && !allowBadRelocate)
 		psAppend(probs, RPMPROB_BADRELOCATE, alp->key, alp->h,
-			 relocations[i].oldPath, NULL,0 );
+			 relocations[i].oldPath, NULL, NULL, 0);
 	} else {
 	    relocations[i].newPath = NULL;
 	}
@@ -394,8 +453,8 @@ static Header relocateFileList(struct availablePackage * alp,
 	    headerAddEntry(h, RPMTAG_INSTPREFIXES, RPM_STRING_ARRAY_TYPE,
 		       (void **) actualRelocations, numActual);
 
-	xfree(actualRelocations);
-	xfree(validRelocations);
+	free((void *)actualRelocations);
+	free((void *)validRelocations);
     }
 
     /* For all relocations, we go through sorted file and relocation lists 
@@ -559,12 +618,12 @@ static Header relocateFileList(struct availablePackage * alp,
 	p = NULL;
 	headerGetEntry(h, RPMTAG_BASENAMES, &t, &p, &c);
 	headerAddEntry(h, RPMTAG_ORIGBASENAMES, t, p, c);
-	xfree(p);
+	free((void *)p);
 
 	p = NULL;
 	headerGetEntry(h, RPMTAG_DIRNAMES, &t, &p, &c);
 	headerAddEntry(h, RPMTAG_ORIGDIRNAMES, t, p, c);
-	xfree(p);
+	free((void *)p);
 
 	p = NULL;
 	headerGetEntry(h, RPMTAG_DIRINDEXES, &t, &p, &c);
@@ -586,22 +645,21 @@ static Header relocateFileList(struct availablePackage * alp,
     return h;
 }
 
+/*
+ * As the problem sets are generated in an order solely dependent
+ * on the ordering of the packages in the transaction, and that
+ * ordering can't be changed, the problem sets must be parallel to
+ * one another. Additionally, the filter set must be a subset of the
+ * target set, given the operations available on transaction set.
+ * This is good, as it lets us perform this trim in linear time, rather
+ * then logarithmic or quadratic.
+ */
 static int psTrim(rpmProblemSet filter, rpmProblemSet target)
 {
-    /* As the problem sets are generated in an order solely dependent
-     * on the ordering of the packages in the transaction, and that
-     * ordering can't be changed, the problem sets must be parallel to
-     * one another. Additionally, the filter set must be a subset of the
-     * target set, given the operations available on transaction set.
-     * This is good, as it lets us perform this trim in linear time, rather
-     * then logarithmic or quadratic.
-     */
-    rpmProblem f, t;
+    rpmProblem f = filter->probs;
+    rpmProblem t = target->probs;
     int gotProblems = 0;
 
-    f = filter->probs;
-    t = target->probs;
-
     while ((f - filter->probs) < filter->numProblems) {
 	if (!f->ignoreProblem) {
 	    f++;
@@ -835,9 +893,8 @@ static int handleInstInstalledFiles(TFI_t * fi, rpmdb db,
 			fi->fmd5s[fileNum],
 			fi->flinks[fileNum])) {
 	    if (reportConflicts)
-		psAppendFile(probs, RPMPROB_FILE_CONFLICT, fi->ap->key,
-			 fi->ap->h, fi->dnl[fi->dil[fileNum]], 
-			 fi->bnl[fileNum], h, 0);
+		psAppend(probs, RPMPROB_FILE_CONFLICT, fi->ap->key, fi->ap->h,
+			fi->dnl[fi->dil[fileNum]], fi->bnl[fileNum], h, 0);
 	    if (!(otherFlags[otherFileNum] | fi->fflags[fileNum])
 			& RPMFILE_CONFIG) {
 		if (!shared->isRemoved)
@@ -1028,7 +1085,7 @@ static void handleOverlappedFiles(TFI_t * fi, hashTable ht,
 			fi->fmd5s[i],
 			fi->flinks[i])) {
 		psAppend(probs, RPMPROB_NEW_FILE_CONFLICT, fi->ap->key,
-			 fi->ap->h, filespec, recs[otherPkgNum]->ap->h, 0);
+			fi->ap->h, filespec, NULL, recs[otherPkgNum]->ap->h, 0);
 	    }
 
 	    /* Try to get the disk accounting correct even if a conflict. */
@@ -1121,7 +1178,7 @@ static int ensureOlder(/*@unused@*/ rpmdb rpmdb, Header new, Header old, rpmProb
 	rc = 0;
     else if (result > 0) {
 	rc = 1;
-	psAppend(probs, RPMPROB_OLDPACKAGE, key, new, NULL, old, 0);
+	psAppend(probs, RPMPROB_OLDPACKAGE, key, new, NULL, NULL, old, 0);
     }
 
     return rc;
@@ -1141,7 +1198,7 @@ static void skipFiles(TFI_t * fi, int noDocs)
     {	const char *tmpPath = rpmExpand("%{_netsharedpath}", NULL);
 	if (tmpPath && *tmpPath != '%')
 	    netsharedPaths = splitString(tmpPath, strlen(tmpPath), ':');
-	xfree(tmpPath);
+	free((void *)tmpPath);
     }
 
     if (!headerGetEntry(fi->h, RPMTAG_FILELANGS, NULL, (void **) &fileLangs,
@@ -1150,12 +1207,12 @@ static void skipFiles(TFI_t * fi, int noDocs)
 
     s = rpmExpand("%{_install_langs}", NULL);
     if (!(s && *s != '%')) {
-	if (s) xfree(s);
+	if (s) free((void *)s);
 	s = NULL;
     }
     if (s) {
 	languages = (const char **) splitString(s, strlen(s), ':');
-	xfree(s);
+	free((void *)s);
     } else
 	languages = NULL;
 
@@ -1258,7 +1315,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
     ts->notifyData = notifyData;
     ts->ignoreSet = ignoreSet;
     if (ts->currDir)
-	xfree(ts->currDir);
+	free((void *)ts->currDir);
     ts->currDir = currentDirectory();
 
     /* Get available space on mounted file systems. */
@@ -1330,10 +1387,12 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	alp++)
     {
 	if (!archOkay(alp->h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREARCH))
-	    psAppend(ts->probs, RPMPROB_BADARCH, alp->key, alp->h, NULL, NULL, 0);
+	    psAppend(ts->probs, RPMPROB_BADARCH, alp->key, alp->h,
+			NULL, NULL, NULL, 0);
 
 	if (!osOkay(alp->h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREOS))
-	    psAppend(ts->probs, RPMPROB_BADOS, alp->key, alp->h, NULL, NULL, 0);
+	    psAppend(ts->probs, RPMPROB_BADOS, alp->key, alp->h,
+			NULL, NULL, NULL, 0);
 
 	if (!(ts->ignoreSet & RPMPROB_FILTER_OLDPACKAGE)) {
 	    rpmdbMatchIterator mi;
@@ -1352,7 +1411,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	    rpmdbSetIteratorRelease(mi, alp->release);
 	    while (rpmdbNextIterator(mi) != NULL) {
 		psAppend(ts->probs, RPMPROB_PKG_INSTALLED, alp->key, alp->h,
-			 NULL, NULL, 0);
+			NULL, NULL, NULL, 0);
 		break;
 	    }
 	    rpmdbFreeIterator(mi);
@@ -1533,6 +1592,8 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	NOTIFY(ts, (NULL, RPMCALLBACK_TRANS_PROGRESS, (fi - flList), flEntries,
 	       NULL, ts->notifyData));
 
+	if (fi->fc == 0) continue;
+
 	/* Extract file info for all files in this package from the database. */
 	matches = xcalloc(sizeof(*matches), fi->fc);
 	if (rpmdbFindFpList(ts->rpmdb, fi->fps, matches, fi->fc))
@@ -1577,7 +1638,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	}
 	numShared = shared - sharedList;
 	shared->otherPkg = -1;
-	xfree(matches);
+	free((void *)matches);
 
 	/* Sort file info by other package index (otherPkg) */
 	qsort(sharedList, numShared, sizeof(*shared), sharedCmp);
@@ -1621,7 +1682,8 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 
 	/* Update disk space needs on each partition for this package. */
 	handleOverlappedFiles(fi, ht,
-	       (ts->ignoreSet & RPMPROB_FILTER_REPLACENEWFILES) ? NULL : ts->probs, di);
+	       ((ts->ignoreSet & RPMPROB_FILTER_REPLACENEWFILES)
+		    ? NULL : ts->probs), di);
 
 	/* Check added package has sufficient space on each partition used. */
 	switch (fi->type) {
@@ -1630,12 +1692,12 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 		break;
 	    for (i = 0; i < filesystemCount; i++) {
 		if (adj_fs_blocks(di[i].bneeded) > di[i].bavail)
-		    psAppend(ts->probs, RPMPROB_DISKSPACE, fi->ap->key, fi->ap->h,
-			filesystems[i], NULL,
-	 	    (adj_fs_blocks(di[i].bneeded) - di[i].bavail) * di[i].bsize);
+		    psAppend(ts->probs, RPMPROB_DISKSPACE, fi->ap->key,
+			fi->ap->h, filesystems[i], NULL, NULL,
+	 	   (adj_fs_blocks(di[i].bneeded) - di[i].bavail) * di[i].bsize);
 		if (adj_fs_blocks(di[i].ineeded) > di[i].iavail)
-		    psAppend(ts->probs, RPMPROB_DISKNODES, fi->ap->key, fi->ap->h,
-			filesystems[i], NULL,
+		    psAppend(ts->probs, RPMPROB_DISKNODES, fi->ap->key,
+			fi->ap->h, filesystems[i], NULL, NULL,
 	 	    (adj_fs_blocks(di[i].ineeded) - di[i].iavail));
 	    }
 	    break;
@@ -1666,7 +1728,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 	    free(fi->fps); fi->fps = NULL;
 	    break;
 	case TR_REMOVED:
-	    xfree(fi->dil); fi->dil = NULL;
+	    free((void *)fi->dil); fi->dil = NULL;
 	    free(fi->fps); fi->fps = NULL;
 	    break;
 	}
diff --git a/lib/tufdio.c b/lib/tufdio.c
index ef64fb4b9..78e0bc84c 100644
--- a/lib/tufdio.c
+++ b/lib/tufdio.c
@@ -9,6 +9,7 @@
 
 #include <stdarg.h>
 #include <err.h>
+#include "debug.h"
 
 extern int _ftp_debug;
 extern int _url_debug;
diff --git a/lib/uninstall.c b/lib/uninstall.c
index 23c917af4..bed6fe6ea 100644
--- a/lib/uninstall.c
+++ b/lib/uninstall.c
@@ -11,6 +11,7 @@
 #include "depends.h"	/* XXX for headerMatchesDepFlags */
 #include "install.h"
 #include "misc.h"	/* XXX for makeTempFile, doputenv */
+#include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
 
@@ -366,7 +367,7 @@ static int runScript(const rpmTransactionSet ts, Header h,
 	    if (ipath && ipath[5] != '%')
 		path = ipath;
 	    doputenv(path);
-	    if (ipath)	xfree(ipath);
+	    if (ipath)	free((void *)ipath);
 	}
 
 	for (i = 0; i < numPrefixes; i++) {
@@ -407,7 +408,7 @@ static int runScript(const rpmTransactionSet ts, Header h,
     
     if (script) {
 	if (!rpmIsDebug()) unlink(fn);
-	xfree(fn);
+	free((void *)fn);
     }
 
     if (!WIFEXITED(status) || WEXITSTATUS(status)) {
diff --git a/lib/verify.c b/lib/verify.c
index 60de1c45f..4169f4c96 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -5,14 +5,14 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include <rpmbuild.h>
+#include <rpmurl.h>
 
-#include "md5.h"
-#include "misc.h"
 #include "depends.h"
 #include "install.h"
-
-#include "build/rpmbuild.h"
-#include <rpmurl.h>
+#include "md5.h"
+#include "misc.h"
+#include "debug.h"
 
 static int _ie = 0x44332211;
 static union _vendian { int i; char b[4]; } *_endian = (union _vendian *)&_ie;
diff --git a/oldrpmdb.c b/oldrpmdb.c
index 89ba72bb8..ca8d8337d 100644
--- a/oldrpmdb.c
+++ b/oldrpmdb.c
@@ -1,9 +1,10 @@
 #include "system.h"
 
-#include "build/rpmbuild.h"
+#include <rpmbuild.h>
 
 #include "rpm_malloc.h"
 #include "oldrpmdb.h"
+#include "debug.h"
 
 static int labelstrlistToLabelList(char * str, int length, 
 				   struct oldrpmdbLabel ** list);
diff --git a/po/cs.po b/po/cs.po
index d91e9ce6d..4bec0838d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,495 +1,495 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
-"PO-Revision-Date: 2000-08-08 22:37+0100\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "chyba: nemohu otevøít %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "nemohu otevøít databázi balíèkù v %s\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "chybné závislosti pøi sestavování:\n"
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nelze otevøít spec soubor %s: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Nelze otevøít rouru pro tar: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Nelze èíst spec soubor %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Nelze pøejmenovat %s: na %s: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "nemohu zjistit stav %s: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Soubor %s není obyèejnı soubor\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Nezdá se, ¾e by %s byl spec soubor.\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Sestavuji cílové platformy: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Sestavuji pro cíl %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (c) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Tento program lze volnì ¹íøit podle podmínek GNU GPL."
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr "pou¾ití: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <adr>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <adr>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <adr>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <poèítaè>] [--ftpport <port>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <poèítaè>] [--httpport <port>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate stará_cesta=nová]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <cesta>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] soubor1.rpm ... souborN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <adr>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <soubor>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <adr>] [--prefix <adr>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <poèítaè>] [--ftpport <port>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--noorder] [--relocate stará_cesta=nová_cesta]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <cesta>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        soubor1.rpm ... souborN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <adr>] [cíle]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <adr>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [cíle]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [cíl]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [cíl]"
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} soubor1.rpm ... souborN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <adr>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 "                        [--justdb] [--notriggers] balíèek1 ... balíèekN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--resign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           balíèek1 ... balíèekN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr "pou¾ití:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "vypsat tuto zprávu"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "vypsat pou¾ívanou verzi rpm"
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr "   v¹echny re¾imy podporují tyto parametry:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<jméno> <tìlo>'"
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr "definování makra <jméno> s obsahem <tìlo>"
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr "    --pipe <pøíkaz>       "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr "vypsat pou¾ívanou verzi rpm"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <pøíkaz>       "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "odeslat stdout do <pøíkazu>"
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <soubor>    "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "pou¾ijte <soubor> místo /etc/rpmrc a $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr "zobrazit finální konfiguraci rpmrc a maker"
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "o nìco upovídanìj¹í reøim"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "velmi upovídanı re¾im (pro ladìní)"
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   instalace, aktualizace a dotazy (s -p) mohou pou¾ívat URL na místìURL"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "   jmen souborù stejnì jako následující volby:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <poèítaè> "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "název poèítaèe nebo IP adresa ftp proxy"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "èíslo portu serveru ftp (nebo proxy)"
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <poèítaè>"
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr "název poèítaèe nebo IP adresa http proxy"
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>    "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr "èíslo portu http serveru (nebo proxy)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "re¾im dotazù"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <adr>      "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "pou¾ít <adr> jako adresáø pro databázi"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "pou¾ít <qfmt> jako hlavièkovı formát (implikuje -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <adr>        "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "pou¾ít <adr> jako adresáø nejvy¹¹í úrovnì"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Volby pro specifikaci balíèku:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "dotázat v¹echny balíèky"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <soubor>+      "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "dotaz na balíèek vlastnící <soubor>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <soubor_balíèku>+ "
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "dotaz na (nenainstalovanı) balíèek <soubor_balíèku>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <balíèek>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "dotazy na balíèky aktivované <balíèkem>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <cap>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr "dotaz na balíèky poskytující schopnost <cap>"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <cap>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr "dotaz na balíèky vy¾adující schopnost <sch>"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Volby pro vybìr informací:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "zobrazit informace o balíèku"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "zobrazit záznamy o zmìnách balíèku"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "zobrazit seznam souborù v balíèku"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "zobrazit stavy souborù (implikuje -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "vypsat pouze soubory s dokumentací (implikuje -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "vypsat pouze konfiguraèní soubory (implikuje -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,23 +497,23 @@ msgstr ""
 "zobrazit v¹echny ovìøitelné údaje pro ka¾dı soubor (musí se pou¾ít s -l, -c "
 "nebo -d)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "uvést schopnosti poskytované balíèkem"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "uvést závislosti balíèku"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "vytisknout [de]instalaèní skripty"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr "zobrazit spou¹tì (triggery) obsa¾ené v balíèku"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -521,140 +521,140 @@ msgstr ""
 "ovìøit instalaci balíèku pou¾itím stejnıch voleb pro specifikaci balíèku, "
 "jako pro -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "nekontrolovat závislosti balíèkù"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "nekontrolovat md5 souèty souborù"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "nekontrolovat atributy souborù"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "uvést pøíznaky, které lze pou¾ít v dotazovacím formátu"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <balíèek>"
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <balíèek>     "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "nainstalovat balíèek"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <cesta>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr "pøeskoèit soubory v cestì <cesta>"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "pøemístit soubory ze <staré_cesty> do <nové_cesty>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr "pøemístìní souborù v nepøemístitelném balíèku"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <adr>      "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "pøemístit soubory do <adr>, jsou-li pøemístitelné"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "neinstalovat dokumentaci"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "zkratka pro --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "bìhem instalace balíèku zobrazit dvojité køí¾ky (dobré s -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "nainstalovat v¹echny soubory i konfigurace, které by se jinak mohly vynechat"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "nekontrolovat architekturu balíèku"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "nekontrolovat volné místo na disku pøed instalací"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "nekontrolovat operaèní systém balíèku"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "nainstalovat dokumentaci"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "upravit databázi, ale neupravovat systém souborovù"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "pro vyøe¹ení závislostí nemìnit poøadí instalace balíèkù"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "nespou¹tìt ¾ádné instalaèní skripty"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "bìhem instalace balíèku zobrazit procenta"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "instalovat, i kdy¾ balíèek pøepí¹e existující soubory"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "pøeinstalovat, i kdy¾ je ji¾ balíèek pøítomen"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "neinstalovat ale sdìlit, zda-li by to fungovalo èi nikoli"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <balíèek>"
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr "    -U <balíèek>          "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "aktualizovat balíèek (stejné volby jako --install, plus)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -662,15 +662,15 @@ msgstr ""
 "aktualizovat na starou verzi balíèku (--force to dìlá pøi aktualizacích "
 "automaticky)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr "    --erase <balíèek>"
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "smazat (deinstalovat) balíèek"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -678,100 +678,100 @@ msgstr ""
 "odstranit v¹echny balíèky odpovídající <balíèku> (obvykle se generuje chyba, "
 "specifikuje-li <balíèek> více balíèkù)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "nespou¹tìt ¾ádné skripty urèené pro balíèky"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<etapa> <spec>      "
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etapa> <tarball> "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "sestavit balíèek, kde <etapa> je jedna z:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "pøíprava (rozbalí zdroje a aplikuje záplaty)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrola seznamù (provede zbì¾né kontroly %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompilace (pøíprava a kompilace)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "instalace (pøíprava, kompilace a instalace)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "binární balíèek (pøíprava, kompilace, instalace, zabalení)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src balíèek (pøíprava, kompilace, instalace, zabalení)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "pøeskoèit pøímo na urèenou etapu (pouze pro c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "po dokonèení odstranit sestavovací strom"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr "po dokonèení odstranit zdrojové kódy"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr "po dokonèení odstranit spec soubor"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr "generovat PGP/GPG podpis"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <adr>   "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "pou¾ít <adr> jako koøen pro sestavení"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "sestavit balíèek pro cíl platforma1...platformaN."
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "nespou¹tìt ¾ádné etapy"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sec>   "
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "nastavit èasovou kontrolu na <sec> sekund (0 ji deaktivuje)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <zdroj_balíèek> "
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -779,63 +779,63 @@ msgstr ""
 "instalovat zdrojovı balíèek, sestavit binární balíèek, odstranit spec "
 "soubor, zdrojové kódy, záplaty a ikony."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <zdroj_balíèek> "
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "jako --rebuild, ale nesestavovat balíèky"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <balíèek>+   "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "podepsat balíèek (zahodit aktuální podpis)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <balíèek>+  "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "pøidat do balíèku podpis"
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <balíèek>+"
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr "    --K <balíèek>+        "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "ovìøit podpis v balíèku"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "vynechat pøípadné PGP podpisy"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr "vynechat pøípadné GPG podpisy"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "vynechat pøípadné MD5 souèty"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "zajistit, aby existovala platná databáze"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "znovu vytvoøit databázi z existující databáze"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -843,7 +843,7 @@ msgstr ""
 "nastavit oprávnìní k souborùm podle údajù v databázi balíèkù pomocí stejnıch "
 "voleb pro specifikaci balíèku, jako pro -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -851,147 +851,147 @@ msgstr ""
 "nastavit vlastníka a skupinu vlastnící soubor podle údajù v databázi balíèkù "
 "pomocí stejnıch voleb pro specifikaci balíèku, jako pro -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "specifikovat lze jen jeden hlavní re¾im"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u a --uninstall jsou zastaralé a ji¾ je nelze pou¾ít.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Pou¾ijte volbu -e nebo --erase.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "pøemístìní musejí zaèínat znakem /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "pøemístìní musejí obsahovat ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "pøemístìní musejí mít za znakem = znak /"
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musí zaèínat znakem /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Interní chyba pøi zpracování parametrù (%d) :-(\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "najednou lze provést jen jeden typ dotazu èi ovìøení"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr "neoèekávanı pøíznak pro dotaz"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr "neoèekávanı formát dotazu"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "neoèekávanı zdroj dotazu"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "vynucena mù¾e bıt jen instalace, aktualizace, smazání zdrojovıch kódù a spec "
 "souboru"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "soubory mohou bıt pøemístìny jen pøi instalaci balíèkù"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "pou¾ít lze jen jeden z parametrù --prefix nebo --relocate"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath je mo¾no pou¾ít jen pøi instalaci novıch balíèkù"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix je mo¾no pou¾ít jen pøi instalaci novıch balíèkù"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "parametry pro --prefix musejí zaèínat znakem /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "pou¾ít lze jen jeden z parametrù --excludedocs a --includedocs"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mù¾e bıt pou¾it jen pøi instalaci balíèkù"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mù¾e bıt pou¾it jen pøi instalaci a odstraòování balíèkù"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -999,7 +999,7 @@ msgstr ""
 "--noscripts mù¾e bıt pou¾it jen pøi instalaci, odstraòování nebo kontrole "
 "balíèkù"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1007,7 +1007,7 @@ msgstr ""
 "--notriggers mù¾e bıt pou¾it jen pøi instalaci, odstraòování nebo kontrole "
 "balíèkù"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1015,13 +1015,13 @@ msgstr ""
 "--nodeps mù¾e bıt pou¾it jen pøi sestavování, rekompilaci, instalaci, "
 "odstraòování a kontrole"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test mù¾e bıt pou¾it jen pøi instalaci, odstraòování a sestavování"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1029,726 +1029,688 @@ msgstr ""
 "--root (-r) mù¾e bıt pou¾it jen pøi instalaci, odstraòování, dotazech nebo "
 "znovuvytvoøení databáze"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametry pro --root (-r) musejí zaèínat znakem /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage lze pou¾ít jen pøi aktualizacích"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp lze pou¾ít jen pøi kontrole podpisù"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg lze pou¾ít jen pøi kontrole podpisù"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 mù¾e bıt pou¾it jen pøi kontrole podpisù a ovìøování balíèkù"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr "¾ádné soubory k podepsání\n"
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "pøístup k souboru %s se nezdaøil\n"
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr "pgp nenalezeno: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr "Vlo¾te heslovou frázi: "
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Chybná heslová fráze\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Heslová fráze je v poøádku.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "©patná %%_signature spec v souboru maker.\n"
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign mù¾e bıt pou¾it jen pøi sestavování balíèkù"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr "spu¹tìní selhalo\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "neoèekávané parametry pro --querytags "
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "ke kontrole podpisu nezadány ¾ádné balíèky"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "k podepsání nezadány ¾ádné balíèky"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "nezadány ¾ádné balíèky pro odstranìní"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "nezadány ¾ádné balíèky pro instalaci"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "k dotazu na v¹echny balíèky zadány parametry navíc"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "k dotazu nezadány ¾ádné parametry"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr "pro kontrolu v¹ech balíèkù zadány parametry navíc"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezadány ¾ádné balíèky"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr "nemohu otevøít balíèek: %s\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr "parametr není RPM balíèek\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr "chyba pøi pøi ètení hlavièky balíèku\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nemohu znovu otevøít payload: %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<jméno> <tìlo>'"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "vypsat pou¾ívanou verzi rpm"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Pou¾ití: %s {--help}\n"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <adr>]\n"
 
-#: rpmqv.c:299
-#, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+#: rpmqv.c:301
+#, c-format
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <soubor>] [--dbpath <adr>]\n"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <soubor>] [--ignorearch] [--dbpath <adr>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <soubor>]"
-
-#: rpmqv.c:323
-#, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+#: rpmqv.c:325
+#, c-format
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <adr>] [--noscripts] [--rcfile <soubor>]\n"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr "                        [--scripts] [--root <adr>] [--rcfile <soubor>]"
-
-#: rpmqv.c:337
-#, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+#: rpmqv.c:339
+#, c-format
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <adr>] [--rcfile <soubor>]\n"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [cíl]\n"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [cíl]\n"
 
-#: rpmqv.c:346
-#, fuzzy, c-format
+#: rpmqv.c:348
+#, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
 "<soubor>]\n"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=platforma1[,platforma2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] spec_soubor"
 
-#: rpmqv.c:350
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#: rpmqv.c:352
+#, c-format
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <soubor>] [-v] spec_soubor\n"
 
-#: rpmqv.c:351
-#, fuzzy, c-format
+#: rpmqv.c:353
+#, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
 
-#: rpmqv.c:352
-#, fuzzy, c-format
+#: rpmqv.c:354
+#, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <soubor>] [-v] zdroj1.rpm ... zdrojN.rpm\n"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} soubor1.rpm ... souborN.rpm\n"
 
-#: rpmqv.c:357
-#, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+#: rpmqv.c:359
+#, c-format
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 "       %s {--resign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN\n"
 
-#: rpmqv.c:358
-#, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+#: rpmqv.c:360
+#, c-format
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       %s {--addsign} [--rcfile <soubor>] balíèek1 balíèek2 ... balíèekN"
 
-#: rpmqv.c:359
-#, fuzzy, c-format
+#: rpmqv.c:361
+#, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <soubor>]\n"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr "  V¹echny re¾imy podporují tyto volby:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<jméno> <tìlo>'"
 
-#: rpmqv.c:406
-#, fuzzy
-msgid "   --eval '<expr>+'       "
+#: rpmqv.c:408
+msgid "   --eval '<name>+'       "
 msgstr "   --eval '<pøíkaz>+'     "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "vypsat pou¾ívanou verzi rpm"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <pøíkaz>       "
 
-#: rpmqv.c:410
-#, fuzzy
-msgid "   --macros <file:...>    "
-msgstr "      --rcfile <soubor>    "
-
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
+msgstr "      --rcfile <soubor>   "
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr "      --dbpath <adr>      "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr "      --root <adr>        "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   Instalace, aktualizace a dotaz (s -p) mohou u¾ívat adresy ve tvaru URL"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr "  na místì jména souboru stejnì jako následující volby:"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr "     --ftpproxy <poèítaè> "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr "     --ftpport <port>     "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr "     --httpproxy <poèítaè> "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr "     --httpport <port>    "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr "      Volby pro specifikaci balíèku:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr "dotázat/ovìøit v¹echny balíèky"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr "     -f <soubor>+         "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr "dotaz/ovìøení balíèku vlastnícího <soubor>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr "     -p <soubor_balíèku>+ "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "dotaz/ovìøení (nenainstalovaného) balíèku <soubor_balíèku>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <balíèek> "
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr "dotaz/ovìøení balíèku aktivovaného <balíèkem>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr "     --whatprovides <cap> "
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr "dotaz/ovìøení balíèkù poskytujících schopnost <cap>"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr "     --whatrequires <cap> "
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr "dotaz/ovìøení balíèkù vy¾adujících schopnost <cap>"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr "     --queryformat <qfmt> "
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr "    Volby pro vybìr informací:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr "uvést schopnosti poskytované balíèkem"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr "uvést schopnosti vy¾adované balíèkem"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr "vytisknout [de]instalaèní skripty"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr "zobrazit spou¹tì (triggery) obsa¾ené v balíèku"
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "nespou¹tìt ¾ádné etapy"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr "   --install <balíèek>"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr "   -i <balíèek>           "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr "     --excludepath <cesta> "
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr "pøeskoèit soubory s úvodní cestou <cesta> "
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr "nespou¹tìt ¾ádné instalaèní skripty"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "nespou¹tìt ¾ádné skripty aktivované tímto balíèkem"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr "     --prefix <adr>       "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "     --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr "   --upgrade <balíèek>"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr "   -U <balíèek>           "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr "   --erase <balíèek>"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr "   -b<etapa> <spec>       "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr "   -t<etapa> <tarball>    "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr "pouze zdrojovı balíèek"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr "     --buildroot <adr>    "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr "     --target=<platforma>+ "
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr "   --rebuild <zdroj_balíèek>"
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr "   --recompile <zdroj_balíèek>"
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr "   --resign <balíèek>+    "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr "   --addsign <balíèek>+   "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <balíèek>+"
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr "   -K <balíèek>+         "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr "inicializovat databázi (není potøeba, zpìtná kompatibilita)"
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr "znovu vytvoøit databázi z existujících databázovıch hlavièek"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Pou¾ijte volbu -e nebo --erase.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath zadána pro operaci, která databázi nepou¾ívá"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "----notriggers mù¾e bıt pou¾ito jen pøi instalaci nebo mazání balíèkù"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestavení nezadány ¾ádné balíèky"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "pro sestavení nezadány ¾ádné spec soubory"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány ¾ádné tar soubory"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr "Nelze otevøít doèasnı soubor."
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Provádìní(%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "Spu¹tìní %s selhalo (%s): %s"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr "Návratovı kód chyby ze %s: (%s)"
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr "chyba syntaxe pøi zpracování =="
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr "chyba syntaxe pøi zpracování &&"
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr "chyba syntaxe pøi zpracování ||"
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr "chyba pøi parsování ve vırazu"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr "nedoplnìná ("
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr "- jen s èísly"
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr "! jen s èísly"
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr "typy musí souhlasit"
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr "* / nejsou podporovány pro øetìzce"
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr "- není podporováno pro øetìzce"
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr "&& a || není podporováno pro øetìzce"
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr "chyba syntaxe ve vırazu"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK selhal: %s\n"
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr "Chybí '(' v %s %s"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "Chybí ')' v %s(%s"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr "Neplatnı %s token: %s"
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr "Neprázdnı znak následuje %s(): %s"
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "©patná syntaxe: %s(%s)"
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "©patná práva: %s(%s)"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr "©patná práva adresáøe: %s(%s)"
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr "Neobvyklá délka locale: \"%.*s\" v %%lang(%s)"
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr "Duplicitní locale %.*s v %%lang(%s)"
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr "Dosa¾en limit pro %%docdir"
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr "Jen jeden parametr pro %%docdir"
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr "Dav soubory na jednom øádku: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "Soubor musí zaèínat \"/\": %s"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr "Nelze míchat speciální %%doc s ostatnímí formáty: %s"
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr "Soubor uveden dvakrát: %s"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr "Symbolická linka ukazuje na BuildRoot: %s -> %s"
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Soubor nesouhlasí s prefixem (%s): %s"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr "Soubor nenalezen: %s"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "©patnı vlastník/skupina: %s\n"
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Soubor %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Soubor potøebuje úvodní \"/\": %s"
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr "Soubor nenalezen: %s"
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr "Nemohu otevøít %%files soubor %s: %s"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "øádek: %s"
@@ -1758,7 +1720,7 @@ msgstr "øádek: %s"
 msgid "Bad file: %s: %s"
 msgstr "©patnı soubor: %s: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "©patnı vlastník/skupina: %s"
@@ -1784,388 +1746,403 @@ msgstr "%s selhalo"
 msgid "failed to write all data to %s"
 msgstr "Nemohu zapsat v¹echna data do %s"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Hledám   %s: (pou¾it %s)...\n"
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr "Selhalo vyhledání %s:"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Zpracovávám soubory: %s-%s-%s\n"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nemohu získat jméno poèítaèe: %s\n"
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "vytváøení archívu selhalo na souboru %s: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr "zápis cpio_copy selhal: %s"
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "ètení cpio_copy selhalo: %s"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "Nemohu otevøít PreIn soubor: %s"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "Nemohu otevøít PreUn soubor: %s"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "Nemohu otevøít PostIn soubor: %s"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "Nemohu otevøít PostUn soubor: %s"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr "Nemohu otevøít VerifyScript soubor: %s"
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr "Nemohu otevøít soubor se spu¹tí (trigger): %s"
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otevøení %s: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ètení %s: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s není RPM balíèek\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ètení hlavièky z %s\n"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr "©patná CSA data"
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr "Generuji podpis: %d\n"
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevøít %s: %s\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Nemohu zapsat balíèek: %s"
 
-#: build/pack.c:445
-#, c-format
-msgid "Generating signature: %d\n"
-msgstr "Generuji podpis: %d\n"
-
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nemohu otevøít cíl pro podepsání %s: %s"
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr "Nemohu èíst cíl pro podepsání %s: %s"
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "Nemohu pøeèíst ikonu %s: %s"
 
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
+#: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
 msgstr "Nemohu zapsat balíèek %s: %s"
 
-#: build/pack.c:494
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Nemohu pøeèíst ikonu %s: %s"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Nemohu zapsat balíèek %s: %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nemohu vygenerovat jméno souboru pro balíèek %s: %s\n"
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr "øádek: %d: druhı %s"
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr "Polo¾ky %%changelog musí zaèínat znakem *"
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr "nekompletní polo¾ka %%changelog"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr "¹patnı datum v %%changelog: %s"
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr "%%changelog není seøazen sestupnì podle èasu"
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr "chybìjící jméno v %%changelog"
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr "¾ádnı popis v %%changelog"
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr "øádek %d: Chyba pøi parsování %%description: %s"
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "øádek %d: ¹patná volba %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr "øádek %d: Pøíli¹ mnoho jmen: %s"
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "øádek %d: Balíèek neexistuje: %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr "øádek %d: Druhé description"
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr "øádek %d: Chyba pøi parsování %%files: %s"
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr "øádek %d: Druhı %%files seznam"
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr "Architektura je vyøazena: %s"
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr "Architektura není vyøazena: %s"
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr "OS je vyøazen: %s"
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr "OS není vyøazen: %s"
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr "Polo¾ka %s musí bıt v balíèku pøítomna: %s"
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr "Duplikovaná polo¾ka %s v balíèku: %s"
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Nemohu otevøít ikonu %s: %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Nemohu pøeèíst ikonu %s: %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr "Neznámı typ ikony: %s"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr "øádek %d: Poèkozená znaèka: %s"
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr "øádek %d: Prázdná znaèka: %s"
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "øádek %d: Nepøípustnı znak '-' v %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "BuildRoot nemù¾e bıt \"/\": %s"
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr "øádek %d: Prefixy nesmí konèit znakem \"/\": %s"
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "øádek %d: Docdir musí zaèínat '/': %s"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "øádek %d: Polo¾ka Epoch/Serial musí bıt èíslo: %s"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "øádek %d: ©patné èíslo %s: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "øádek %d: ©patnı formát BuildArchitecture: %s"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr "Interní chyba: ©patná znaèka: %d"
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr "¹patná specifikace balíèku: %s"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr "Balíèek ji¾ existuje: %s"
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr "øádek %d: Neznámá znaèka: %s"
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr "Spec soubor nemù¾e pou¾ít BuildRoot"
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr "©patnı zdroj: %s: %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr "Patch èíslo %d neexistuje"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr "Zdroj èíslo %d neexistuje"
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Nemohu naèíst nosource %s: %s"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr "Chyba pøi parsování %%setup: %s"
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "øádek %d: ©patnı parametr v %%setup %c: %s"
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "øádek %d: ©patná volba v %%setup %s: %s"
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "øádek %d: K %%patch -b potøebuji parametr: %s"
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "øádek %d: K %%patch -z potøebuji parametr: %s"
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "øádek %d: K %%patch -p potøebuji parametr: %s"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "øádek %d: ©patnı parametr pro %%patch -p: %s"
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr "Pøíli¹ mnoho patchù!"
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "øádek %d: ©patnı parametr pro %%patch: %s"
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr "øádek %d: druhı %%prep"
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
@@ -2173,99 +2150,99 @@ msgstr ""
 "øádek %d: Polo¾ky v závislostech musí zaèínat alfanumerickım znakem, '_' "
 "nebo '/': %s"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "øádek %d: Jméno souboru není dovoleno: %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "øádek %d: Jméno s verzí není dovoleno: %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr "øádek %d: Vy¾adována verze: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr "øádek %d: spou¹tì (triggery) musí mít --: %s"
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr "øádek %d: Chyba pøi parsování %s: %s"
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr "øádek %d: jméno skriptu musí zaèínat '/': %s"
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr "øádek %d: Druhı %s"
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr "øádek %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nemohu otevøít %s: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr "Neuzavøenı %%if"
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s:%d: parseExpressionBoolean vrátil %d"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: %%else bez poèíteèního if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: %%endif bez poèáteèního if"
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr "po¹kozenı pøíkaz %%include"
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr "®ádné architektury pro sestavení"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr "Balíèek nemá ¾ádné %%description: %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr "archive = %s, fs = %s\n"
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr "øádek %d: ©patné èíslo: %s"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr "øádek %d: ©patné èíslo %s: %d"
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "øádek %d: ©patné èíslo %s: %s\n"
@@ -2280,50 +2257,50 @@ msgstr "Nemohu pøejmenovat %s na %s: %s\n"
 msgid "can't unlink %s: %s\n"
 msgstr "Nemohu provést unlink %s: %s\n"
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(chyba: 0x%x)"
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr "©patné magické èíslo"
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr "©patná nebo neèitelná hlavièka"
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr "Velikost hlavièky je pøili¹ velká"
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr "Neznámı typ souboru"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr "Chybìjící hardlink"
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr "Interní chyba"
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr "selhal - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2332,132 +2309,132 @@ msgstr ""
 "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s ANO (pøidány soubory)\n"
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s ANO (pøidáno poskytuje)\n"
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr "%s: %-45s %-3s (ke¹ováno)\n"
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ANO (db soubory)\n"
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraòuji \"%s\" z indexu %s.\n"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr "db%d error(%d)"
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr " provádím %s"
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr "zavøen db soubor       %s\n"
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr "odstranìn db soubor    %s\n"
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr "¹patnı db soubor %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otevírám db soubor     %s mode 0x%x\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nemohu zamknout databázi %s"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "vıhradní"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "sdílenı"
 
@@ -2486,57 +2463,57 @@ msgstr "zavøen db index        %s/%s(%s)\n"
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr "otevøen db index       %s/%s(%s) %s mode=0x%x\n"
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr "dbiSetConfig: ignorována neznámá db volba: \"%s\"\n"
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s má neplatnou numerickou hodnotu, pøeskoèeno\n"
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s má moc velkou nebo moc malou long hodnotu, pøeskoèeno\n"
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s má pøíli¹ velkou nebo moc malou celoèíselnou hodnotu, pøeskoèeno\n"
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr "uzavøeno DB prostøedí %s/%s\n"
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr "odstranìno db prostøedí %s/%s\n"
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr "otevírám db environment %s/%s %s\n"
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr "uzavøen db index       %s/%s\n"
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "otevírám db index      %s/%s %s mode=0x%x\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nemohu zamknout databázi zámkem %s v %s/%s\n"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "uzamèen db index       %s/%s\n"
@@ -2556,125 +2533,112 @@ msgstr ""
 "na http://www.rpm.org nebo v diskuzním listu rpm-list@redhat.com.\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(není èíslo)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr "mntctl() nevrátil velikost polo¾ky fugger: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr "nemohu zjistit stav %s: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr "získávám seznam pøipojenıch systémù souborù\n"
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "nemohu otevøít %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr "soubor %s je na neznámém zaøízení"
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
+#, fuzzy
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Poèet RPM_STRING_TYPE pro grabData() musí bıt 1.\n"
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datovı typ %d není podporován\n"
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybnı poèet pro headerAddEntry(): %d\n"
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "chybí { po %"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "po %{ chybí }"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "prázdnı formát znaèky"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "prázdné jméno znaèky"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "neznámá znaèka"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "na konci pole oèekáváno ]"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "neoèekávaná ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "neoèekávaná }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "ve vırazu oèekáván ?"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr "ve vırazu je po ? oèekávána {"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "ve vırazu je oèekávána }"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr "v podvırazu je po ? oèekávána :"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr "ve vırazu je po : oèekávána {"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "na konci vırazu je oèekáváno |"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(neznámı typ)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   soubor: %s akce: %s\n"
@@ -2689,546 +2653,545 @@ msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root"
 msgid "group %s does not exist - using root"
 msgstr "skupina %s neexistuje - pou¾ita skupina root"
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "hodnova %%instchangelog v makro souboru má bıt èíslo, ale není"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozbalování archívu selhalo %s%s: %s"
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr "instaluji zdrojovı balíèek\n"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nemohu vytvoøir adresáø pro zdrojové soubory: %s"
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr "nemohu zapsat do %s"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr "zdrojové soubory v: %s\n"
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "nemohu vytvoøit adresáø pro spec soubory: %s"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec soubor v: %s\n"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr "zdrojovı balíèek neobsahuje spec soubor"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "pøejmenovávám %s na %s\n"
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "pøejmenování %s na %s selhalo: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr "oèekávám balíèek se zdrojovımi kódy, nalezen v¹ak binární"
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balíèek: %s-%s-%s test souborù = %d\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr "ukonèuji instalaci, proto¾e je spu¹tìn --test\n"
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr "spou¹tím pøípadnı pøedinstalaèní skript\n"
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varování: %s vytvoøeno jako %s"
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varování: %s ulo¾eno jako %s"
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr "spou¹tím pøípadnı postinstalaèní skript\n"
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "chyba pøi vytváøení doèasného souboru %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "práce s balíèky verze 1 není podporována touto verzí RPM"
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "tato verze RPM podporuje práci s balíèky s hlavním (major) èíslem <= 4"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr "buildroot ji¾ byl nastaven"
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr "provádím %%prep èást podle spec souboru"
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr "provádím %%prep èást podle spec souboru"
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr "provádím %%install èást podle spec souboru"
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr "kontrola èásti %%files ve spec souboru"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr "vytvoøení zdrojového a binárního balíèku podle spec souboru"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr "vytvoøení binárního balíèku podle spec souboru"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr "vytvoøení zdrojového balíèku podle spec souboru"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr "provádím %%prep èást z tar souboru"
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr "provádím %%build èást z tar souboru"
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr "provádím %%install èást z tar souboru"
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr "kontrola èásti %%files z tar souboru"
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr "vytvoøení zdrojového a binárního balíèku z tar souboru"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr "vytvoøení binárního balíèku z tar souboru"
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr "vytvoøení zdrojového balíèku z tar souboru"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr "vytvoøení binárního balíèku ze zdrojového"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr "provádím %%install èást ze zdrojového balíèku"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr "build root pøedefinován"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr "nespou¹tìt ¾ádné etapy vytváøení balíèku"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "ignorovat I18N zprávy ve spec souboru"
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr "po dokonèení odstranit spec soubor"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr "cílová platforma pøedefinována"
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr "vyhledat I18N øetìzce katalogu spec souboru"
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr "dotaz/ovìøení balíèku vlastnícího <soubor>"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr "dotaz/ovìøení balíèkù ve skupinì"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr "dotaz/ovìøení souboru s balíèkem"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr "re¾im dotazù"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr "zobrazit známé znaèky pro dotazy"
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr "dotaz na spec soubor"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr "dotazy na balíèky aktivované balíèkem"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr "re¾im kontroly"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr "re¾im kontroly (zastaralı)"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr "dotázat balíèky vy¾adující schopnost"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr "dotázat balíèky poskytující schopnost"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr "vypsat v¹echny konfiguraèní soubory"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr "vypsat v¹echny soubory s dokumentací"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr "zobrazit základní informace o souborech"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr "vypsat soubory v balíèku"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr "pou¾ij následující formát dotazù"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr "nahradit i18n sekce do spec souboru"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr "zobrazit stav vypsanıch souborù"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr "zobrazit roz¹íøenı vıpis souborù"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je nutné pro %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/problems.c:103
-#, c-format
-msgid "package %s-%s-%s is for a different architecture"
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
 msgstr "balíèek %s-%s-%s je pro jinou architekturu"
 
-#: lib/problems.c:108
-#, c-format
-msgid "package %s-%s-%s is for a different operating system"
+#: lib/problems.c:103
+#, fuzzy, c-format
+msgid "package %s is for a different operating system"
 msgstr "balíèek %s-%s-%s je pro jinı operaèní systém"
 
-#: lib/problems.c:113
-#, c-format
-msgid "package %s-%s-%s is already installed"
+#: lib/problems.c:107
+#, fuzzy, c-format
+msgid "package %s is already installed"
 msgstr "balíèek %s-%s-%s je ji¾ nainstalován"
 
-#: lib/problems.c:118
-#, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
-msgstr "cesta %s není pøemístitelná pro balíèek %s-%s-%s"
+#: lib/problems.c:111
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "balíèek %s není pøemístitelnı\n"
 
-#: lib/problems.c:123
-#, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+#: lib/problems.c:116
+#, fuzzy, c-format
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr "soubor %s zpùsobuje konflikt mezi instalovanım %s-%s-%s a %s-%s-%s"
 
-#: lib/problems.c:129
-#, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+#: lib/problems.c:121
+#, fuzzy, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "soubor %s z instalace %s-%s-%s koliduje se souborem z balíèku %s-%s-%s"
 
-#: lib/problems.c:135
-#, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+#: lib/problems.c:126
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "balíèek %s-%s-%s (kterı je novìj¹í, ne¾ %s-%s-%s) je ji¾ nainstalován"
 
-#: lib/problems.c:141
-#, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+#: lib/problems.c:131
+#, fuzzy, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "instalace balíèku %s-%s-%s potøebuje %ld%cb na systému souborù %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, fuzzy, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalace balíèku %s-%s-%s potøebuje %ld%cb na systému souborù %s"
 
-#: lib/problems.c:158
-#, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+#: lib/problems.c:146
+#, fuzzy, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "v balíèku %s-%s-%s pøedtransakèní syscall(s): %s selhalo: %s"
 
-#: lib/problems.c:166
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+#: lib/problems.c:153
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s-%s-%s"
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "chyba ve formátu: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(neobsahuje ¾ádné soubory)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr "normální      "
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr "nahrazen      "
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr "neinstalován  "
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr "sdílen v síti "
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámı %3d) "
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr "(chybí stav)  "
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr "balíèek nemá vlastníka souboru ani seznamy id"
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otevøení %s selhalo: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "nezdá se, ¾e by %s byl balíèek typu RPM\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "dotaz na %s se nezdaøil\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr "¾ádné balíèky\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾ádné balíèky\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾ádnı balíèek neaktivuje %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾ádnı balíèek nevy¾aduje %s\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾ádnı balíèek neposkytuje %s\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "soubor %s nevlastní ¾ádnı balíèek\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatné èíslo balíèku: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr "záznam balíèku èíslo: %u\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "záznam %d nelze pøeèíst\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíèek %s není nainstalován\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otevøení selhalo: %s\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile selhalo\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: RPM v1.0 nelze podepsat\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature selhalo\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Není dostupnı ¾ádnı podpis\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead selhalo: %s\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature selhalo: %s\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Není dostupnı ¾ádnı podpis (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr "NENÍ OK"
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr " (CHYBÍ KLÍÈ:"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÙVÌRYHODNİ KLÍÈ:"
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr "OK"
 
@@ -3325,7 +3288,7 @@ msgstr "chyba(%d) pøi ukládání záznamu %s do %s"
 msgid "error(%d) removing record %s from %s"
 msgstr "chyba(%d) pøi odstraòování záznamu %s z %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
@@ -3338,513 +3301,508 @@ msgstr ""
 "formátu databáze"
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba(%d) pøi poèítání balíèkù"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%s: nemohu èíst hlavièku na 0x%x"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuji 0 %s polo¾ek.\n"
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuji \"%s\" z indexu %s.\n"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraòuji %d polo¾ek z indexu %s.\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba(%d) pøi alokaci nové instance balíèku"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr "pøidávám 0 %s polo¾ek.\n"
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "pøidávám \"%s\" do indexu %s\n"
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "pøidávám %d polo¾ek do indexu %s.\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "databázi %s pøevádím do %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáze %s ji¾ existuje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr "vytváøím adresáø %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pøi vytváøení adresáøe %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otevírám starou databázi s dbapi %d\n"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otevírám novou databázi s dbapi %d\n"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databázi je chybnı -- vynechávám."
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nemohu pøidat záznam - pùvodnì u %d"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "pro obnovení nahraïte soubory v %s soubory z %s"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr "ma¾u adresáø %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nemohu odstranit adresáø %s: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "nezadány ¾ádné balíèky pro instalaci"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr "poèítám balíèky pro instalaci\n"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "nalezeno %d balíèkù\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr "hledám balíèky pro sta¾ení\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "pøeskakuji %s - rpmGlob selhal(%d)\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Stahuji %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... jako %s\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "pøeskakuji %s - pøenos selhal - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "pøijato %d balíèkù\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nemohu otevøít soubor %s: %s\n"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nemù¾e bıt nainstalován\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otevøít databázi balíèkù v %s\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balíèek %s není pøemístitelnı\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pøi ètení ze souboru %s\n"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "soubor %s vy¾aduje novìj¹í verzi RPM\n"
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "nalezeno %d zdrojovıch a %d binárních balíèkù\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "nevyøe¹ené závislosti:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "instaluji binární balíèky\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "chyba: nemohu otevøít %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" urèuje více balíèkù\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaluji %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "ètení selhalo: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "chybí druhá ':' u %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "chybí název architektury u %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Neúplnı datovı øádek %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Pøíli¹ mnoho parametrù v datovém øádku %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Chybné èíslo architektury nebo OS: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Neúplnı standardní øádek %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Pøíli¹ mnoho parametrù ve vıchozím øádku u %s:%d"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Nemohu expandovat %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr "Nemohu èíst %s, HOME je pøíli¹ velkı."
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Nemohu otevøít %s pro ètení: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Nemohu èíst %s: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "chybí ':' (nalezeno na 0x%02x) v %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "chybí parametr pro %s u %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "expanze %s selhala na %s:%d \"%s\""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "nemohu otevøít soubor %s na %s:%d: %s"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "chybí architektura pro %s u %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "chybná volba '%s' u %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámı systém: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Zkontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr "velikost podpisu: %d\n"
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
-msgstr "Hlavièka+Archiv: %d\n"
+msgid "file is not regular -- skipping size check\n"
+msgstr "není obyèejnı soubor -- pøeskakuji kontrolu velikosti\n"
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
-msgstr "oèekáv. velikost: %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
+msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
-msgstr "není obyèejnı soubor -- pøeskakuji kontrolu velikosti\n"
+#: lib/signature.c:123
+#, fuzzy, c-format
+msgid "  Actual size: %12d\n"
+msgstr "Velikost podpisu: %d\n"
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr "Starı PGP podpis\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Starı (pouze interní) podpis! Jak jste to získali!?"
 
-#: lib/signature.c:157
-msgid "New Header signature\n"
-msgstr "Novı podpis hlavièky\n"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr "Velikost podpisu: %d\n"
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr "Podpisovı blok: %d\n"
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "Nemohu spustit pgp (%s)"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp selhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "pgp selhalo pøi zápisu podpisu"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Velikost podpisu PGP: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "nemohu èíst podpis"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Pøeèteno %d bajtù PGP podpisu\n"
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr "Nemohu spustit gpg"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr "gpg selhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr "gpg selhalo pøi zápisu podpisu"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Velikost GPG podpisu: %d\n"
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Pøeèteno %d bajtù GPG podpisu\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr "Generuji PGP podpis.\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr "Generuji GPG podpis.\n"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "Nemohu spustit pgp. Vynechte kontroly PGP pomocí --nopgp."
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr "spu¹tìní selhalo!\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "Nelze spustit gpg. Vynechte kontroly GPG pomocí --nogpg."
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "Nemohu spustit pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr "Neplatná %%_signature v makro souboru"
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr "vynechávám soubor %s%s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "vynechávám adresáø %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "pøemís»uji %s do %s\n"
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "pøemís»uji adresáø %s do %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n"
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "nemohu odstranit %s - adresáø není prázdnı"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "rmdir %s selhalo: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "odstranìní %s selhalo: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr "odstraní se soubory test = %d\n"
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr "spou¹tím pøípadnı postdeinstalaèní skript\n"
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "provedení %s-%s-%s skriptu selhalo, návratovı kód: %d"
@@ -3874,218 +3832,224 @@ msgstr "chybí      %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr "Úspìch"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr "Chybná odezva FTP serveru"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr "IO chyba serveru"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr "Timeout serveru"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr "Nelze pøevést jméno na IP adresu poèítaèe"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr "Nelze pøevést IP na jméno poèítaèe"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr "Pøipojení k serveru selhalo"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr "Selhalo navázání datového spojení se serverem"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "IO chyba pøi lokálním souboru"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pøi nastavení vzdáleného serveru do pasivního re¾imu"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr "Probíhá pøeru¹ení"
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr "Neznámá nebo neoèekávaná chyba"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "pøihla¹ování na %s jako %s, heslo %s\n"
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivní %d prázdnı %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prázdnı)"
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prázdnı)\n"
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr "Makro %%%s má neukonèené tìlo"
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr "Makro %%%s má neplatné jméno (%%define)"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr "Makro %%%s má neukonèené parametry"
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr "Makro %%%s má prázdné tìlo"
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr "Expanze makra %%%s selhala"
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr "Makro %%%s má neplatné jméno (%%undefine)"
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) nebylo pou¾ito pod úrovní %d"
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Neznámá volba: %c v %s(%s)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "Hloubka rekurze(%d) je vìt¹í, ne¾ max(%d)"
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Neukonèené %c: %s"
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr "Za %% následuje neparsovatelné makro"
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr "makro %%%.*s nenalezeno, pøeskakuji"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr "Cílovı buffer pøetekl"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "Soubor %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "Soubor %s je men¹í, ne¾ %d bajtù"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "(chyba: 0x%x)"
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "fatální chyba: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "chyba: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "varování: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "alokace pamìti (%u bajtù) vrátila NULL.\n"
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "varování: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "varování: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "varování: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pro %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "chyba: %sport musí bıt èíslo\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr "url port musí bıt èíslo\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
-#~ msgid "undefined identifier"
-#~ msgstr "nedefinovanı identifikátor"
+#~ msgid "sigsize         : %d\n"
+#~ msgstr "velikost podpisu: %d\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "smyèka v øetìzu podmínek: %s"
+#~ msgid "Header + Archive: %d\n"
+#~ msgstr "Hlavièka+Archiv: %d\n"
 
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "      --rcfile <soubor>   "
+#~ msgid "expected size   : %d\n"
+#~ msgstr "oèekáv. velikost: %d\n"
+
+#~ msgid "New Header signature\n"
+#~ msgstr "Novı podpis hlavièky\n"
+
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "cesta %s není pøemístitelná pro balíèek %s-%s-%s"
 
 #~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
 #~ msgstr "RPMERR_INTERNAL: Dosa¾en limit v getUname()\n"
@@ -4095,3 +4059,12 @@ msgstr "nemohu vytvoøit %s: %s\n"
 
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "interní chyba (chyba v rpm?): "
+
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Nemohu èíst cíl pro podepsání %s: %s"
+
+#~ msgid "undefined identifier"
+#~ msgstr "nedefinovanı identifikátor"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "smyèka v øetìzu podmínek: %s"
diff --git a/po/da.po b/po/da.po
index 38db0bf01..7c64372c2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,1715 +9,1677 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
 msgstr "Kan ikke åbne %s/packages.rpm\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan ikke åbne spec-fil %s: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Kan ikke åbne spec-fil %s: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Kan ikke åbne spec-fil %s: %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "ugyldig flag '%s' ved %s:%d"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "ugyldig flag '%s' ved %s:%d"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Filen er ikke en regulær fil: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Filen %s synes ikke at være en spec-fil.\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Ophavsret (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr "Brug: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <kat>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <kat>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <vært>] [--ftpport <port>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <vært>] [--httpport <port>] "
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate gammelsti=nysti]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <sti>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] fil-1.rpm ... fil-N.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <kat>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <kat>] [--prefix <kat>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <vært>] [--httpport <port>] "
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate gammelsti=nysti]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <sti>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        fil-1.rpm ... fil-N.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [mål]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <kat>] [mål]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [mål]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [mål]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [mål]"
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} fil-1.rpm ... fil-N.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <kat>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] rpakke1 ... pakkeN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           pakke1 ... pakkeN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr "Brug:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "vis denne meddelse"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "vis versionen af rpm som benyttes"
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr "   Alle tilstande understøtter følgende argumenter:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<name> <body>'"
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr "definér makro <name> med værdi <body>"
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<name>+'      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <kmd>          "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr "    --rcfile <fil>        "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <vært>   "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <vært>  "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <kat>      "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "forespørg alle pakker"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "installér pakke"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>  "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "installér ikke dokumentation"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr "    --erase <pakke>"
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "slet (afinstallér) pakke"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompilér (forbered og kompilér)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "installér (forbered, kompilér og installér)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sek>   "
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pakke>+     "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pakke>+    "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "tilføj signatur til pakke"
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pakke>+"
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr "    -K <pakke>+           "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "verificér pakke signatur"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage må kun bruges under opgraderinger"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp må kun bruges under signaturkontrollering"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg må kun bruges under signaturkontrollering"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr "pgp ikke fundet: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr "kan ikke åbne pakke: %s\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr "argument er ikke en RPM-pakke\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<name> <body>'"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Brug: %s {--help}\n"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <katalog>]\n"
 
-#: rpmqv.c:299
-#, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+#: rpmqv.c:301
+#, c-format
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]\n"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
-
-#: rpmqv.c:323
-#, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+#: rpmqv.c:325
+#, c-format
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]\n"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
-
-#: rpmqv.c:337
-#, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+#: rpmqv.c:339
+#, c-format
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]\n"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [mål]\n"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [mål]\n"
 
-#: rpmqv.c:346
-#, fuzzy, c-format
+#: rpmqv.c:348
+#, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<fil>]\n"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=platform1[,platform2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] spec-fil"
 
-#: rpmqv.c:350
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#: rpmqv.c:352
+#, c-format
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] 'spec'-fil\n"
 
-#: rpmqv.c:351
-#, fuzzy, c-format
+#: rpmqv.c:353
+#, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
 
-#: rpmqv.c:352
-#, fuzzy, c-format
+#: rpmqv.c:354
+#, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <fil>] [-v] kilde1.rpm ... kildeN.rpm\n"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
 
-#: rpmqv.c:357
-#, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+#: rpmqv.c:359
+#, c-format
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN\n"
 
-#: rpmqv.c:358
-#, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
-msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
+#: rpmqv.c:360
+#, c-format
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgstr ""
 
-#: rpmqv.c:359
-#, fuzzy, c-format
+#: rpmqv.c:361
+#, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<name> <body>'"
 
-#: rpmqv.c:406
-#, fuzzy
-msgid "   --eval '<expr>+'       "
+#: rpmqv.c:408
+msgid "   --eval '<name>+'       "
 msgstr "   --eval '<name>+'       "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "vis versionen af rpm som benyttes"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "   --pipe <kmd>           "
 
-#: rpmqv.c:410
-#, fuzzy
-msgid "   --macros <file:...>    "
-msgstr "    --rcfile <fil>        "
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
+msgstr "   --rcfile <fil>         "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr "   --dbpath <katalog>     "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr "   --root <katalog>       "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    --eval '<name>+'      "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1727,7 +1689,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1753,486 +1715,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
 #, c-format
-msgid "Could not open %s: %s\n"
+msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:418
 #, c-format
-msgid "Unable to write package: %s"
+msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:455
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr ""
-
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
-msgstr ""
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "Kan ikke åbne spec-fil %s: %s\n"
 
 #: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
+msgstr "Kan ikke åbne spec-fil %s: %s\n"
+
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Kan ikke åbne spec-fil %s: %s\n"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Kan ikke åbne spec-fil %s: %s\n"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2247,182 +2224,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2451,57 +2428,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2517,125 +2494,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2650,546 +2613,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr "OK"
 
@@ -3263,7 +3225,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3274,511 +3236,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr "opretter kataloget %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr "fjener kataloget %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "fundet %d pakke(r)\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr "leder efter pakker til at hente\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Modtager %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "modtager %d pakker\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan ikke åbne fil %s: %s\n"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Kan ikke åbne %s/packages.rpm\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "installerer binære pakker\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "Kan ikke åbne %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke åbne %s: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
-#, fuzzy, c-format
+#: lib/rpmrc.c:150
+#, c-format
 msgid "missing second ':' at %s:%d"
-msgstr "manglende arkitektur for %s ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:150
-#, fuzzy, c-format
+#: lib/rpmrc.c:153
+#, c-format
 msgid "missing architecture name at %s:%d"
-msgstr "manglende arkitektur for %s ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Kan ikke udvide %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
-#, fuzzy, c-format
+#: lib/rpmrc.c:576
+#, c-format
 msgid "Unable to open %s for reading: %s."
-msgstr "Kan ikke åbne spec-fil %s: %s\n"
+msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
-#, fuzzy, c-format
+#: lib/rpmrc.c:621
+#, c-format
 msgid "Failed to read %s: %s."
-msgstr "ugyldig flag '%s' ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:655
-#, fuzzy, c-format
+#: lib/rpmrc.c:658
+#, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
-msgstr "manglende arkitektur for %s ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
-#, fuzzy, c-format
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
+#, c-format
 msgid "missing argument for %s at %s:%d"
-msgstr "manglende arkitektur for %s ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "kan ikke åbne %s ved %s:%d: %s"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "manglende arkitektur for %s ved %s:%d"
 
-#: lib/rpmrc.c:805
-#, fuzzy, c-format
+#: lib/rpmrc.c:808
+#, c-format
 msgid "bad option '%s' at %s:%d"
-msgstr "kan ikke åbne %s ved %s:%d: %s"
+msgstr "ugyldig flag '%s' ved %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Ukendt system: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontakt venligst rpm-list@redhat.com\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp fejlede"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr "gpg fejlede"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "fjernelse af %s fejlede: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3805,212 +3762,209 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr "Succés"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr "Tidsudløb for tjener"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Fil ikke fundet på tjener"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiv %d tom %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr "Makro %%%s har ugyldig navn (%%define)"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "fatal fejl: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "fejl: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "advarsel: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Adgangskode for %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
 
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "   --rcfile <fil>         "
-
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "intern fejl (rpm fejl?): "
 
diff --git a/po/de.po b/po/de.po
index 4a9653a3b..2b796fb56 100644
--- a/po/de.po
+++ b/po/de.po
@@ -36,8 +36,8 @@
 # ### sollte »query« nicht besser mit Abfrage üs werden (statt Anfrage)? -ke-
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -45,524 +45,524 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
 
 # , c-format
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
 # , c-format
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s scheint kein RPM-Paket zu sein\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s scheint kein RPM-Paket zu sein\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
 # , c-format
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Version %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright © 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Dies darf unter den Bedingungen der »GNU GPL« frei verteilt werden"
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "Benutzung: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <VERZ>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <VERZ>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <VERZ>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate <ALTPFAD>=<NEUPFAD>]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <VERZ>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <VERZ>]"
 
-#: rpm.c:226
+#: rpm.c:227
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <HOST>] [--ftpport <PORT>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate <ALTPFAD>=<NEUPFAD>]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <VERZ>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <VERZ>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [ZIELE]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [ZIEL]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [ZIEL]"
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <VERZ>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] PAKET1 ... PAKETn"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpm.c:250
+#: rpm.c:251
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           PAKET1 ... PAKETn"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "Benutzung:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "Gibt diesen Text aus"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "Die benutzte RPM-Version anzeigen"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   alle Modi unterstützen folgende Argumente:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "Die benutzte RPM-Version anzeigen"
 
-#: rpm.c:299
+#: rpm.c:300
 #, fuzzy
 msgid "    --pipe <cmd>          "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "Standard-Ausgabe nach <BEFEHL> umleiten"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "<DATEI> anstelle von /etc/rpmrc und $HOME/.rpmrc benutzen"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "Ausgabe etwas ausführlicher gestalten"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "extrem ausführliche Ausgabe (um Programm-Fehler zu finden)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   Installieren, Aktualisieren und Anfragen (mit -p) erlauben es, ftp-URLs"
 
-#: rpm.c:312
+#: rpm.c:313
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr ""
 "   anstelle von Dateinamen zu benutzen. Außerdem die folgenden Optionen:\n"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "Hostname oder IP des ftp-Proxys"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "Portnummer des ftp-Servers (oder -Proxys)"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "Hostname oder IP des ftp-Proxys"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "Portnummer des ftp-Servers (oder -Proxys)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "Anfrage-Modus"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 #, fuzzy
 msgid "      --dbpath <dir>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "<VERZ> als Datenbankverzeichnis benutzen"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "S als Kopfzeilen-Format benutzen (impliziert -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "<VERZ> als Stammverzeichnis benutzen"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Optionen der Paketauswahl:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "Anfrage an alle Pakete"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "Anfrage nach (nicht installiertem) Paket <PAKET-DATEI>"
 
-#: rpm.c:338
+#: rpm.c:339
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:339
+#: rpm.c:340
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:340
+#: rpm.c:341
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:341
+#: rpm.c:342
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: rpm.c:342
+#: rpm.c:343
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpm.c:343
+#: rpm.c:344
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Optionen der Informationsauswahl:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "Paketinformationen anzeigen"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "Changelog des Pakets anzeigen"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "Dateiliste des Pakets anzeigen"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "Status der Dateien anzeigen (impliziert -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "Nur Dokumentationsdateien auflisten (impliziert -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -570,172 +570,172 @@ msgstr ""
 "Alle überprüfbaren Infos zu jeder Datei anzeigen (mit -l, -c oder -d "
 "benutzen!)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "Fähigkeiten des Pakets auflisten"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "Paket-Abhängigkeiten ausgeben"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "Die diversen (De-)Installations-Skripte ausgeben"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 "Ein Paket mit denselben Paketspezifikations-Optionen wie bei -q überprüfen"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "Dateiabhängigkeiten nicht überprüfen"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "md5-Prüfsumme der Datei nicht überprüfen"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "Dateiattribute nicht überprüfen"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "Tags auflisten, die im Anfrageformat benutzt werden können"
 
-#: rpm.c:385
+#: rpm.c:386
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "Paket installieren"
 
-#: rpm.c:386
+#: rpm.c:387
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "Paket installieren"
 
-#: rpm.c:388
+#: rpm.c:389
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "Verschiebe das Paket, wenn es verschiebbar ist, in das Verzeichnis <VERZ>"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "Dokumentation nicht installieren"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "Abkürzung für --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "Fortschrittsanzeige bei der Paketinstallation (gut zusammen mit -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "alle Dateien installieren, auch die config-Dateien, die sonst übergangen "
 "würden"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "Paket-Betriebssystem nicht überprüfen"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "Dokumentation installieren"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "Datenbank erneuern, aber das Dateisystem nicht verändern"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "Paket-Installation nicht neu sortieren, um den Abhängigkeiten zu genügen"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "Prozentangabe bei der Paketinstallation ausgeben"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "Auch dann installieren, wenn das Paket installierte Dateien ersetzt"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "Neuinstallation, wenn das Paket schon vorhanden ist"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "Nicht installieren - nur anzeigen, ob es funktionieren würde"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "Paket aktualisieren (dieselben Optionen wie --install, außerdem)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -743,15 +743,15 @@ msgstr ""
 "Aktualisierung auf eine alte Version des Pakets (--force macht das bei "
 "Aktualisierungen automatisch)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "Paket löschen (deinstallieren)"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -759,111 +759,111 @@ msgstr ""
 "Alle Pakete entfernen, die mit <PAKET> übereinstimmen (normalerweise wird "
 "ein Fehler angezeigt, wenn <PAKET> mehrere Pakete bezeichnet)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "Keine paketspezifischen Skripte ausführen"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:464
+#: rpm.c:465
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "Paket erstellen, <STUFE> ist einer der Buchstaben:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "präparieren (Quellen entpacken und Patch-Dateien anwenden"
 
 # , c-format
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrollieren (oberflächliche Überprüfung der %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompilieren (präparieren und kompilieren)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "installieren (präparieren, kompilieren, installieren)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 "Binärpaket erstellen (präparieren, kompilieren, installieren und paketieren)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "Binär- und Quellpaket erstellen (präparieren, kompilieren, installieren und "
 "Paketieren"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "Direkt zur angegeben Stufe springen (nur für c und i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "Erstellungsdateibaum nach Beendigung löschen"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP-Signatur generieren"
 
-#: rpm.c:488
+#: rpm.c:489
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "Keine Stufen ausführen"
 
-#: rpm.c:494
+#: rpm.c:495
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:495
+#: rpm.c:496
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "Die Zeitüberprüfung auf S Sekunden setzen (mit 0 ausschalten)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -871,69 +871,69 @@ msgstr ""
 "Quellpaket installieren, Binarypaket erstellen und spec-Datei, Quellen, "
 "Patch-Dateien und Icons löschen"
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "wie --rebuild aber kein Paket erstellen"
 
-#: rpm.c:503
+#: rpm.c:504
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: rpm.c:505
+#: rpm.c:506
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "Signatur einem Paket hinzufügen"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "Paketsignatur überprüfen"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "alle PGP-Signaturen überspringen"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "alle PGP-Signaturen überspringen"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "alle MD5-Signaturen überspringen"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "Sicherstellen, daß eine gültige Datenbank vorhanden ist"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
 # Was ist gemeint?
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -942,7 +942,7 @@ msgstr ""
 "Paketspezifikationsoptionen wie bei -q benutzt würden"
 
 # Was ist gemeint?
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -950,155 +950,155 @@ msgstr ""
 "Datei-Eigentümer und -Gruppe gemäß deren in der Paketdatenbank setzen, wie "
 "wenn dieselben Paketspezifikationsoptionen wie bei -q benutzt würden"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "Es darf nur ein Hauptmodus angegeben werden"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u und --uninstall sind veraltet und funktionieren nicht mehr.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Benutzen Sie stattdessen -e oder --erase\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "Verschiebungen müssen ein »=« beinhalten"
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "bei Verschiebungen muss ein »/« dem »=« folgen"
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 "Nur nur eine Art der Anfrage/Überprüfung kann pro Programmlauf durchgeführt "
 "werden"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "nur die Installation und Aktualisierung darf erzwungen werden"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "Dateien können nur während der Paketinstallation verschoben werden"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix darf nur bei der Installation neuer Pakete benutzt werden"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "Argumente zu --prefix müssen mit einem / beginnen"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "nur eines der Argumente --excludedocs und --includedocs darf angegeben werden"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches darf nur während der Paketdeinstallaiton angegeben werden"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles darf nur während der Paketinstallation angegeben werden"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1106,7 +1106,7 @@ msgstr ""
 "--noscripts darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1114,7 +1114,7 @@ msgstr ""
 "--notriggers darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1123,7 +1123,7 @@ msgstr ""
 "--nodeps darf nur während der Paketinstallation, -deinstallation und "
 "-überprüfung angegeben werden"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1131,7 +1131,7 @@ msgstr ""
 "--test darf nur während der Paketinstallation, -deinstallation und "
 "-erstellung angegeben werden"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1139,571 +1139,535 @@ msgstr ""
 "--root (-r) darf nur während der Paketinstallation, -deinstallation, "
 "-anfrage und Datenbankneuerstellungen angegeben werden"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "Argumente zu --root (-r) müssen mit einem / beginnen"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage darf nur während Aktualisierungen benutzt werden"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp darf nur während der Signatur-Überprüfung benutzt werden"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nopgp darf nur während der Signatur- und Paketüberprüfung angegeben werden"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Die Passwortüberprüfung ist fehlgeschlagen\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Das Passwort ist richtig.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign darf nur während der Paketerstellung benutzt werden"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "Unerwartete Argumente zu --querytags "
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "Es wurden keine Pakete für die Signaturüberprüfung angegeben"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "Es wurden keine Pakete für die Signatur angeben"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "Zusätzliche Argumente für die Anfrage an alle Pakete angegeben"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "Die benutzte RPM-Version anzeigen"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Benutzung: rpm {--help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <VERZ>]"
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <DATEI>] [--dbpath <VERZ>]"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <DATEI>] [--ignorearch] [--dbpath <VERZ>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <DATEI>]"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <VERZ>] [--noscripts] [--rcfile <DATEI>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr "                        [--scripts] [--root <VERZ>] [--rcfile <DATEI>]"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <VERZ>] [--rcfile <DATEI>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [ZIEL]"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [ZIEL]"
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<DATEI>]"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [ZIELE]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--buildarch <ARCH>] [--rmsource] SPEC-DATEI"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <DATAEI>] [-v] SPEC-DATEI"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <DATEI>] [-v] SOURCE1.rpm ... SOURCEn.rpm"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "                        [--badreloc] DATEI1.rpm ... DATEIn.rpm"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <DATEI>] PAKET1 PAKET2 ... PAKETn"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <DATEI>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   alle Modi unterstützen folgende Argumente:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "Die benutzte RPM-Version anzeigen"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   Installieren, Aktualisieren und Anfragen (mit -p) erlauben es, ftp-URLs"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr ""
 "   anstelle von Dateinamen zu benutzen. Außerdem die folgenden Optionen:\n"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Optionen der Paketauswahl:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Anfrage an alle Pakete"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "Anfrage nach (nicht installiertem) Paket <PAKET-DATEI>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Optionen der Informationsauswahl:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "Fähigkeiten des Pakets auflisten"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "Fähigkeiten des Pakets auflisten"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "Die diversen (De-)Installations-Skripte ausgeben"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "Keine Stufen ausführen"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "Paket installieren"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "Keine Installations-Skripte ausführen"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "kein Skript ausführen, das durch dieses Paket veranlasst wurde"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "verschiebe Dateien von <alter_Pfad> nach <neuer_Pfad>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "Paket installieren"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "Paket installieren"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
 msgstr "Paket hat keinen Namen"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<STUFE> <SPEC>      "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Benutzen Sie stattdessen -e oder --erase\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 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:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
@@ -1711,224 +1675,224 @@ msgstr ""
 "--justdb kann nur während der Paketinstallation und -deinstallation "
 "angegeben werden"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
 # , c-format
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
 # , c-format
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Hole %s heraus\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 #, fuzzy
 msgid "syntax error while parsing =="
 msgstr "? im Ausdruck erwartet"
 
-#: build/expression.c:237
+#: build/expression.c:238
 #, fuzzy
 msgid "syntax error while parsing &&"
 msgstr "? im Ausdruck erwartet"
 
-#: build/expression.c:246
+#: build/expression.c:247
 #, fuzzy
 msgid "syntax error while parsing ||"
 msgstr "? im Ausdruck erwartet"
 
-#: build/expression.c:286
+#: build/expression.c:287
 #, fuzzy
 msgid "parse error in expression"
 msgstr "? im Ausdruck erwartet"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 #, fuzzy
 msgid "syntax error in expression"
 msgstr "? im Ausdruck erwartet"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s"
 msgstr "fehlende { nach %{"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "fehlender ':' bei %s:%d"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
 # , c-format
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 # , c-format
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, fuzzy, c-format
 msgid "Two files on one line: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:816
+#: build/files.c:817
 #, fuzzy, c-format
 msgid "File listed twice: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:1015
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1080
+#: build/files.c:1081
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1939,7 +1903,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1966,507 +1930,524 @@ msgstr "pgp fehlgeschlagen"
 msgid "failed to write all data to %s"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/files.c:1973
+#: build/files.c:2001
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:49
+#: build/pack.c:48
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
 # , c-format
-#: build/pack.c:226
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/pack.c:236
+#: build/pack.c:231
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
+#: build/pack.c:408
+#, fuzzy, c-format
+msgid "Generating signature: %d\n"
+msgstr "PGP-Signatur generieren"
+
 # , c-format
-#: build/pack.c:400
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:433
+#: build/pack.c:455
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:445
+# , c-format
+#: build/pack.c:470
 #, fuzzy, c-format
-msgid "Generating signature: %d\n"
-msgstr "PGP-Signatur generieren"
+msgid "Unable to open sigtarget %s: %s"
+msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:458
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:465
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:471
+#: build/pack.c:504
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:494
+# , c-format
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Nicht möglich %s zu schreiben"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
 # , c-format
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
 # , c-format
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, fuzzy, c-format
 msgid "Unknown icon type: %s"
 msgstr "(unbekannter Typ)"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
 # , c-format
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "ungültige Paket-Nummer: %s\n"
+
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "fehlende Architektur für %s bei %s:%d"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, fuzzy, c-format
 msgid "Bad package specification: %s"
 msgstr "      Optionen der Paketauswahl:"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
 # , c-format
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, fuzzy, c-format
 msgid "Bad source: %s: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, fuzzy, c-format
 msgid "No patch number %d"
 msgstr "(keine Zahl)"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
 # , c-format
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "Verschiebungen müssen mit einem »/« beginnen"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, fuzzy, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # , c-format
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "Paket-Architektur nicht überprüfen"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
@@ -2482,187 +2463,187 @@ msgstr "Lesen von %s fehlgeschlagen: %s."
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "Fehler: "
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(unbekannter Typ)"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 #, fuzzy
 msgid "Internal error"
 msgstr "Fataler Fehler: "
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 #, fuzzy
 msgid " failed - "
 msgstr "pgp fehlgeschlagen"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # FIXME
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
 # , c-format
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "geteilt"
 
@@ -2691,57 +2672,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2757,131 +2738,117 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(keine Zahl)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
 # , c-format
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, fuzzy, c-format
 msgid "failed to stat %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
 # , c-format
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "fehlende { nach %{"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "fehlende } nach %{"
 
 # »Tag« übersetzen??? -ke-
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "leeres »Tag«-Format"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "leerer »Tag«-Name"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "unbekannter »Tag«"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "] am Ende des Arrays erwartet"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "unerwartete ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "unerwartete }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "? im Ausdruck erwartet"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ nach ? im Ausdruck erwartet"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "} im Ausdruck erwartet"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ": nach ? Unterausdruck erwartet"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ nach : im Ausdruck erwartet"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "| am Ende des Ausdrucks erwartet"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(unbekannter Typ)"
 
 # , c-format
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -2896,593 +2863,592 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "Paket installieren"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/install.c:767
+#: lib/install.c:775
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "umbennen von %s nach %s fehlgeschlagen: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/install.c:982
+#: lib/install.c:990
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 #, fuzzy
 msgid "build source package from tar ball"
 msgstr "Erstelle die Pakete für das Betriebssystem <BS>"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr ""
 "Binärpaket erstellen (präparieren, kompilieren, installieren und paketieren)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "Paket installieren"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 #, fuzzy
 msgid "override build root"
 msgstr "Benutze <VERZ> als Stammverzeichnis beim Erstellen"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "Quellen und spec-Dateien nach Beendigung löschen"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "Paket hat keinen Namen"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "Anfrage-Modus"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 #, fuzzy
 msgid "query a spec file"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 #, fuzzy
 msgid "query the pacakges triggered by the package"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "Anfrage-Modus"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "Anfrage-Modus"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 #, fuzzy
 msgid "query the packages which require a capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> benötigen"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 #, fuzzy
 msgid "query the packages which provide a capability"
 msgstr "Anfrage nach Paketen, die die Fähigkeit <i> bereitstellen"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Nur Konfigurationsdateien auflisten (impliziert -l)"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Dokumentation installieren"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "dump basic file information"
 msgstr "Paketinformationen anzeigen"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "list files in package"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 #, fuzzy
 msgid "use the following query format"
 msgstr "Unerwartete Quelle der Anfrage"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "Dateiliste des Pakets anzeigen"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " wird von %s-%s-%s gebraucht\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " steht im Konflikt mit %s-%s-%s\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, fuzzy, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, fuzzy, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " steht im Konflikt mit %s-%s-%s\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, fuzzy, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "Fehler beim Format %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(beinhaltet keine Dateien)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 #, fuzzy
 msgid "not installed "
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(unbekannter Typ)"
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s scheint kein RPM-Paket zu sein\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "kein Paket verlangt %s\n"
 
 # oder besser: ... listet %s auf? -ke-
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:661
+#: lib/query.c:662
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Kann v1.0-RPM nicht signieren\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3557,7 +3523,7 @@ msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 msgid "error(%d) removing record %s from %s"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "»dbpath« ist nicht gesetzt"
 
@@ -3568,538 +3534,532 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
 # , c-format
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Hole %s heraus\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "Fehler: %s kann nicht installiert werden\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "Paket installieren"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, fuzzy, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
 # oder besser: "... verletzen" ?
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "fehlendes zweites ':' bei %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "fehlender Name cer Architektur bei %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Unvollständige Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Zu viele Argumente in der Datenzeile bei %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Unzureichende arch/os Zahl: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Unvollständige Standardzeile bei %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Zu viele Argumente in der Standardzeile bei %s:%d"
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "kann Datei %s nicht öffnen: "
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "fehlender ':' bei %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "fehlendes Argument für %s bei %s:%d"
 
 # , c-format
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "fehlende Architektur für %s bei %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "unzureichende Option '%s' bei %s:%d"
 
-#: lib/rpmrc.c:1202
-#, fuzzy, c-format
+#: lib/rpmrc.c:1205
+#, c-format
 msgid "Unknown system: %s\n"
-msgstr "(unbekannter Typ)"
-
-#: lib/rpmrc.c:1203
-msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
+#: lib/rpmrc.c:1206
+msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Alte Signatur (nur intern)!  Wie bist du daran gekommen!?"
 
-#: lib/signature.c:157
-#, fuzzy
-msgid "New Header signature\n"
-msgstr "nicht möglich, die Signatur zu lesen"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp fehlgeschlagen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "nicht möglich, die Signatur zu lesen"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 #, fuzzy
 msgid "Couldn't exec gpg"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 #, fuzzy
 msgid "gpg failed"
 msgstr "pgp fehlgeschlagen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 #, fuzzy
 msgid "gpg failed to write signature"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "Konnte pgp nicht aufrufen.  Überspring die PGP-Checks mit --nopgp."
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 #, fuzzy
 msgid "exec failed!\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "Konnte pgp nicht aufrufen.  Überspring die PGP-Checks mit --nopgp."
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "Konnte pgp nicht durchführen"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
 # , c-format
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "kann %s nicht entfernen - Verzeichnis ist nicht leer"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "Entfernen von %s fehlgeschlagen: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "öffnen von %s fehlgeschlagen: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "Ausführung des Skripts fehlgeschlagen"
@@ -4127,226 +4087,235 @@ msgstr "fehlende { nach %{"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 #, fuzzy
 msgid "Bad server response"
 msgstr "Nicht passende Antwort des FTP-Servers"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP IO-Fehler"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 #, fuzzy
 msgid "Server timeout"
 msgstr "Timeout des FTP-Servers"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Verbindung zum FTP-Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "IO-Fehler bei lokaler Datei"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP Unbekannter oder nicht erwarteter Fehler"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "Fehler: "
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "Fataler Fehler: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "Fehler: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "Warnung: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Passworf für %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 
 # , c-format
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 #, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "    -b<STUFE> <SPEC>      "
+#~ msgid "New Header signature\n"
+#~ msgstr "nicht möglich, die Signatur zu lesen"
+
+#, fuzzy
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "Paket %s ist nicht installiert\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Nicht möglich %s zu schreiben"
 
 #~ msgid ""
 #~ "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
@@ -4563,6 +4532,10 @@ msgstr "anlegen von %s fehlgeschlagen\n"
 #~ msgid "package has no files\n"
 #~ msgstr "Paket hat keinen Namen"
 
+#, fuzzy
+#~ msgid "cannot create %s"
+#~ msgstr "kann Datei %s nicht öffnen: "
+
 # , c-format
 #, fuzzy
 #~ msgid "Unable to stat icon: %s"
diff --git a/po/es.po b/po/es.po
index 268c54c31..b6b43ac46 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 86d651ca9..8b1337890 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -9,522 +9,522 @@ msgstr ""
 "Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
 "--keyword=N_\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "puuttuvat riippuvuudet:\n"
 
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "%s:n avaus epäonnistui\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "En voi lukea %s: %s."
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "En voi lukea %s: %s."
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "en voinut avata %s: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s ei vaikuta RPM-paketilta\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s ei vaikuta RPM-paketilta\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Tätä ohjelmaa voi vapaasti levittää GNU GPL:n puittessa"
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "käyttö: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <hakem>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <hakem>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
 "<hakem>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <hakem>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate vanhapolku=uusipolku]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <hakem>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <hakem>] [--prefix "
 "<hakem>] "
 
-#: rpm.c:226
+#: rpm.c:227
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <kone>] [--ftpport <portti>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate vanhapolku=uusipolku]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <hakem>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <hakem>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [kohteet]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [kohde]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [kohde]"
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <hakem>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] paketti1 ... pakettiN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--resign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpm.c:250
+#: rpm.c:251
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           paketti1 ... pakettiN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "käyttö:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "tulosta tämä viesti"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   kaikki moodit tukevat seuraavia parametrejä"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: rpm.c:299
+#: rpm.c:300
 #, fuzzy
 msgid "    --pipe <cmd>          "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "lähetä vakiotuloste <komento>:lle"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "käytä <tiedosto> eikä /etc/rpmrc tai $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "tulosta enemmän viestejä"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "tulosta mahdollisimman paljon viestejä (vianetsintään)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja "
 "voidaan käyttää"
 
-#: rpm.c:312
+#: rpm.c:313
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   tiedostoniminä, kuten myös seuraavia parametrejä:\n"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "koneen nimi tai IP tai ftp-proxy"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp-palvelijan (tai proxyn) porttinumero"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "koneen nimi tai IP tai ftp-proxy"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "ftp-palvelijan (tai proxyn) porttinumero"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "kyselymoodi"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 #, fuzzy
 msgid "      --dbpath <dir>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "kaytä <hakem> tietokannan hakemistona"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "käytä s headerin formaatina (josta seuraa -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "käytä <hakem> ylimpänä hakemistona"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Paketin määrittelyparametrit:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "kysele kaikki paketit"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "kysele(asentamatonta) pakettia <pakettitiedosto>"
 
-#: rpm.c:338
+#: rpm.c:339
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:339
+#: rpm.c:340
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:340
+#: rpm.c:341
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:341
+#: rpm.c:342
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: rpm.c:342
+#: rpm.c:343
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpm.c:343
+#: rpm.c:344
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Tietojen valintaparametrit:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "näytä paketin tiedot"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "näytä paketin muutosloki"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "näytä paketin tiedostolistaus"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "näytä tiedostojen tilat (josta seuraa -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "listaa vain dokumettitiedostot (josta seuraa -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -532,23 +532,23 @@ msgstr ""
 "näytä kaikki varmistettavissa oleva tieto kustakin tiedostosta (pitää "
 "käyttää -l, -c, tai -d kanssa)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "luettele paketin tarjoamat ominaisuudet"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "listaa paketin riippuvuudet"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "tulosta erinäiset asennus/poisto-skriptit"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -556,146 +556,146 @@ msgstr ""
 "tarkista paketin asennus käyttäen samoja paketin määrittelyparametrejä kuin "
 "-q "
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "älä tarkista paketin riippuvuuksia"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "älä tarkista tiedostojen md5-tarkistussummia"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "älä tarkista tiedostojen ominaisuuksia"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "luettele nimiöt, joita voidaan käyttää kyselyn formaatissa"
 
-#: rpm.c:385
+#: rpm.c:386
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "asenna paketti"
 
-#: rpm.c:386
+#: rpm.c:387
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "asenna paketti"
 
-#: rpm.c:388
+#: rpm.c:389
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "siirrä paketti hakemistoon <hakem>, jos siirrettävissä"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "älä asenna dokumentointia"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "lyhenne parametreille --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "tulosta risuaitaa paketin asentuessa (-v:n kanssa hyvä)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "älä tarkista paketin käyttöjärjestelmää"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "asenna dokumentaatio"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "päivitä tietokanta, mutta älä muuta tiedostojärjestelmää"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "älä muuta asennusjärjestystä riippuvuuksien tyydyttämiseksi"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "älä suorita asennusskriptejä"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "tulosta asennuksen eteneminen prosentteina"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "asenna vaikka paketti korvaisi asennettuja tiedostoja"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "asenna uudelleen, jos paketti on jo asennettu"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "älä asenna, mutta kerro onnistuisiko se"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "päivitä paketti (samat parametrit kuin --install, plus)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -703,15 +703,15 @@ msgstr ""
 "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
 "automaattisesti)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "poista paketti"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -719,107 +719,107 @@ msgstr ""
 "poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  "
 "<paketti> määrittää useita paketteja, tulee virhe)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "älä aja mitään pakettikohtaisia skriptejä"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:464
+#: rpm.c:465
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "tee paketti, jossa <vaihe> on jokin:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "valmistele (pura lähdekoodi ja tee korjaukset)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "listatarkistus (tee joitakin tarkistuksia %tiedostoihin)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "käännä (valmistele ja käännä)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "asenna (valmistele, käännä ja asenna)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "binääripaketti (valmistele, käännä, asenna, paketoi)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src-paketti (valmistele, käännä, asenna, paketoi)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "siirry suoraan määriteltyyn vaiheeseen (vain c ja i yhteydessä)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "poista käännöspuu, kun valmis"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "generoi PGP-allekirjoitus"
 
-#: rpm.c:488
+#: rpm.c:489
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "käytä <hakem> käännöspuun juurena"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "älä suorita mitään vaiheita"
 
-#: rpm.c:494
+#: rpm.c:495
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:495
+#: rpm.c:496
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "aseta aikatarkistus S sekunniksi (0 ohittaa)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -827,68 +827,68 @@ msgstr ""
 "asenna lähdekoodipaketti, käännä binääripaketti ja poista "
 "määrittelytiedosto, lähdekoodi, korjaukset ja kuvakkeet"
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "kuten --rebuild, mutta ei käännä paketteja"
 
-#: rpm.c:503
+#: rpm.c:504
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: rpm.c:505
+#: rpm.c:506
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "lisää allekirjoitus pakettiin"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "tarkista paketin allekirjoitus"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "ohita PGP-allekirjoitukset"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "ohita PGP-allekirjoitukset"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "ohita MD5-allekirjoitukset"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "tarkista, että kunnollinen tietokanta löytyy"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -896,7 +896,7 @@ msgstr ""
 "aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa "
 "käyttäen samoja pakettien määrittelyparametrejä kuin -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -904,151 +904,151 @@ msgstr ""
 "aseta tiedostojen omistaja ja ryhmä niiksi, jotka ne ovat pakettien "
 "tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "vain yksi päämoodi voidaan määritellä"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ja --uninstall ovat vanhentuneet eivätkä enää toimi.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Käytä sen sijaan -e tai --erase .\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "siirroissa pitää olla =-merkki"
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "siirroissa pitää olla / =-merkin jälkeen"
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "yhden tyyppinen kysely/tarkistus voidaan suorittaa kerralla"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "odottamaton kyselyn lähde"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "vain asennus tai päivitys voidaan pakottaa"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "tiedostoja voidaan siirtää toiselle polulle vain asennettaessa"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "vain toinen --prefix tai --relocate voidaan antaa"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix: voidaan käyttää vain uusia paketteja asennettaessa"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix parametrien pitää alkaa /-merkillä"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h): voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "vain toinen --excludedocs tai --includedocs voidaan antaa"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches: voidaan käyttää vain paketteja poistettaessa"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1056,7 +1056,7 @@ msgstr ""
 "--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:916
+#: rpm.c:917
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1065,7 +1065,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1074,7 +1074,7 @@ msgstr ""
 "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
 "tarkistettaessa"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1082,7 +1082,7 @@ msgstr ""
 "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
 "käännettäessä"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1090,24 +1090,24 @@ msgstr ""
 "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
 "kyseltäessä ja tietokannan uudelleenluonnissa"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "parametrit --root (-r):lle alettava /-merkillä"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage: voidaan käyttää vain paketteja päivitettäessä"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
@@ -1115,302 +1115,264 @@ msgstr ""
 "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa ja paketteja "
 "todennettaessa"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags: odottamattomia parametrejä"
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "allekirjoituksen tarkistukselle ei määritelty paketteja"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "allekirjoitukselle ei määritelty paketteja"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "poistolle ei määritelty paketteja"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "pakettien kyselylle annettiin ylimääräisiä parametrejä"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrejä"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "tulosta käytetyn rpm:n versio"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "käyttö: rpm {--help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <hakem>]"
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <tiedosto>] [--dbpath <hakem>]"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <tiedosto>] [--ignorearch] [--dbpath "
-"<hakem>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <tiedosto>]"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <hakem>] [--noscripts] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"                        [--scripts] [--root <hakem>] [--rcfile <tiedosto>]"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <hakem>] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [kohde]"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [kohde]"
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<tiedosto>]"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [kohteet]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 "                        [--buildarch <arkk>] [--rmsource] määrittelytiedosto"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
 "lähdekoodiN.rpm"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
 "lähdekoodiN.rpm"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "                        [--badreloc] tiedosto1.rpm ... tiedostoN.rpm"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 "       rpm {--resign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <tiedosto>] paketti1 paketti2 ... pakettiN"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <tiedosto>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   kaikki moodit tukevat seuraavia parametrejä"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "tulosta käytetyn rpm:n versio"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1418,468 +1380,468 @@ msgstr ""
 "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja "
 "voidaan käyttää"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   tiedostoniminä, kuten myös seuraavia parametrejä:\n"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Paketin määrittelyparametrit:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "kysele kaikki paketit"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "kysele(asentamatonta) pakettia <pakettitiedosto>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Tietojen valintaparametrit:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "luettele paketin tarjoamat ominaisuudet"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "luettele paketin tarjoamat ominaisuudet"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "tulosta erinäiset asennus/poisto-skriptit"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "älä suorita mitään vaiheita"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "asenna paketti"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "älä suorita asennusskriptejä"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "siirrä tiedostot hakemistosta <vanhapolku> hakemistoon <uusipolku>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "asenna paketti"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "asenna paketti"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
 msgstr "paketilla ei ole nimeä"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<vaihe> <määrittely> "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Käytä sen sijaan -e tai --erase .\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath parametri annettu toiminnolle, joka ei käytä tietokantaa"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "uudelleenkäännolle ei määritelty paketteja"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "käännökselle ei annettu määrittelytiedostoja"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Haen: %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 #, fuzzy
 msgid "syntax error while parsing =="
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: build/expression.c:237
+#: build/expression.c:238
 #, fuzzy
 msgid "syntax error while parsing &&"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: build/expression.c:246
+#: build/expression.c:247
 #, fuzzy
 msgid "syntax error while parsing ||"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: build/expression.c:286
+#: build/expression.c:287
 #, fuzzy
 msgid "parse error in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 #, fuzzy
 msgid "syntax error in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "puuttuva ':', %s:%d"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, fuzzy, c-format
 msgid "Two files on one line: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, fuzzy, c-format
 msgid "File listed twice: %s"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1889,7 +1851,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1915,488 +1877,503 @@ msgstr "pgp epäonnistui"
 msgid "failed to write all data to %s"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "luku epäonnistui: %s (%d)"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "virhe: %s ei vaikuta RPM paketilta\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, fuzzy, c-format
+msgid "Generating signature: %d\n"
+msgstr "generoi PGP-allekirjoitus"
+
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, fuzzy, c-format
-msgid "Generating signature: %d\n"
-msgstr "generoi PGP-allekirjoitus"
+msgid "Unable to open sigtarget %s: %s"
+msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "%s:n kirjoitus ei onnistu"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, fuzzy, c-format
 msgid "Unknown icon type: %s"
 msgstr "(tuntematon tyyppi)"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "virheellinen paketin numero: %s\n"
+
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "%s:n puuttuva arkkitehtuuri %s:%d"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, fuzzy, c-format
 msgid "Bad package specification: %s"
 msgstr "      Paketin määrittelyparametrit:"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, fuzzy, c-format
 msgid "Bad source: %s: %s"
 msgstr "En voi lukea %s: %s."
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, fuzzy, c-format
 msgid "No patch number %d"
 msgstr "(ei ole luku)"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "En voi lukea %s: %s."
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "siirtojen pitää alkaa /-merkillä"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, fuzzy, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "en voinut avata %s: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "älä tarkista paketin arkkitehtuuria"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
@@ -2411,185 +2388,185 @@ msgstr "En voi lukea %s: %s."
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "virhe: "
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(tuntematon tyyppi)"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 #, fuzzy
 msgid "Internal error"
 msgstr "vakava virhe: "
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 #, fuzzy
 msgid " failed - "
 msgstr "pgp epäonnistui"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "en voinut avata %s: %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "jaettua"
 
@@ -2618,57 +2595,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2684,127 +2661,113 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(ei ole luku)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, fuzzy, c-format
 msgid "failed to stat %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "puuttuva '{' '%{':n jälkeen"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "tyhjä nimiön formaatti"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "tyhjä nimiön nimi"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "tuntematon nimiö"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "']' puuttuu taulukkomäärittelyn lopusta"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "odottamaton ']'"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "odottamaton '}'"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "odotin '}'-merkkiä ilmauksessa"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(tuntematon tyyppi)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -2819,584 +2782,583 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "asenna paketti"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s:n nimeäminen %s:ksi epäonnistui: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 #, fuzzy
 msgid "build source package from tar ball"
 msgstr "käännä paketit käyttöjärjestelmälle <kj>"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr "binääripaketti (valmistele, käännä, asenna, paketoi)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "asenna paketti"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 #, fuzzy
 msgid "override build root"
 msgstr "käytä <hakem> käännöspuun juurena"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "poista lähdekoodit ja määrittelytiedosto, kun valmis"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "kysele kaikki paketit"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "kyselymoodi"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 #, fuzzy
 msgid "query a spec file"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 #, fuzzy
 msgid "query the pacakges triggered by the package"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "kyselymoodi"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "kyselymoodi"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 #, fuzzy
 msgid "query the packages which require a capability"
 msgstr "kysele paketteja, jotka vaativat <i> ominaisuutta"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 #, fuzzy
 msgid "query the packages which provide a capability"
 msgstr "kysele paketteja, jotka tarjoavat <i> ominaisuuden"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 #, fuzzy
 msgid "list all configuration files"
 msgstr "listaa vain konfigurointiedostot (josta seuraa -l)"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr "asenna dokumentaatio"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "dump basic file information"
 msgstr "näytä paketin tiedot"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "list files in package"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 #, fuzzy
 msgid "use the following query format"
 msgstr "odottamaton kyselyn lähde"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "näytä paketin tiedostolistaus"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr "vaatii %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, fuzzy, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, fuzzy, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, fuzzy, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "virhe formaatissa: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(ei tiedostoja)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 #, fuzzy
 msgid "not installed "
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(tuntematon tyyppi)"
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ei vaikuta RPM-paketilta\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "mikään pakettie ei tarvitse %s:a\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "mikään paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3470,7 +3432,7 @@ msgstr "virhe talletettaessa tietuetta %s %s:ään"
 msgid "error(%d) removing record %s from %s"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
@@ -3481,527 +3443,521 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "asennukselle ei määritelty paketteja"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Haen: %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "virhe: %s ei voida asentaa\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "puuttuvat riippuvuudet:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "asenna paketti"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, fuzzy, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "virhe: en voi avata %s%s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" määrittää useita paketteja\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "luku epäonnistui: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "toinen ':' puuttuu, %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "puuttuva arkkitehtuurin nimi, %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Epätäydellinen datarivi, %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "liian monta parametriä datarivillä %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Huono arkkitehtuuri/käyttöjärjestelmä numero: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Epätäydellinen oletusrivi, %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "liian monta parametriä oletusrivillä %s:%d"
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "en voinut avata tiedostoa %s: "
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "En voi avata %s luettavaksi: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "En voi lukea %s: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "puuttuva ':', %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "%s:n puuttuva parametri %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "%s:n puuttuva arkkitehtuuri %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "huono parametri '%s', %s:%d"
 
-#: lib/rpmrc.c:1202
-#, fuzzy, c-format
+#: lib/rpmrc.c:1205
+#, c-format
 msgid "Unknown system: %s\n"
-msgstr "(tuntematon tyyppi)"
-
-#: lib/rpmrc.c:1203
-msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
+#: lib/rpmrc.c:1206
+msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
 
-#: lib/signature.c:157
-#, fuzzy
-msgid "New Header signature\n"
-msgstr "en voinut lukea allekirjoitusta"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp epäonnistui"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "en voinut lukea allekirjoitusta"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 #, fuzzy
 msgid "Couldn't exec gpg"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 #, fuzzy
 msgid "gpg failed"
 msgstr "pgp epäonnistui"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 #, fuzzy
 msgid "gpg failed to write signature"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "En voinut ajaa pgp:tä. Käytä --nopgpg ohittaaksesi PGP-tarkistus"
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 #, fuzzy
 msgid "exec failed!\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "En voinut ajaa pgp:tä. Käytä --nopgpg ohittaaksesi PGP-tarkistus"
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "En voinut ajaa pgp:tä"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "Haen: %s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "en voi poistaa %s -hakemisto ei ole tyhjä"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "%s:n rmdir epäonnistui: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "%s:n poisto epäonnistui: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "skriptin ajo epäonnistui"
@@ -4029,226 +3985,234 @@ msgstr "puuttuva '{' '%':n jälkeen"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 #, fuzzy
 msgid "Bad server response"
 msgstr "Virheellinen FTP-palvelijan vastaus"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP:n IO-virhe"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP-palvelimen timeout"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP-palvelimen osoitetta ei löytynyt"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP-palvelimen nimeä ei löytynyt"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "En saanut yhteyttä FTP-palvelijaan"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "En saanut data-yhteyttä FTP-palvelijaan"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "Paikallisen tiedoston IO-virhe"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Virhe asetettaessa palvelinta passiiviin moodiin"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP:n tuntematon tai odottamaton virhe"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "virhe: "
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "vakava virhe: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "virhe: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "varoitus: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s:n salasana: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "virhe: ftpport pitää olla luku\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "virhe: ftpport pitää olla luku\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "silmukka edellytysten ketjussa: %s"
+#, fuzzy
+#~ msgid "New Header signature\n"
+#~ msgstr "en voinut lukea allekirjoitusta"
 
 #, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "    -b<vaihe> <määrittely> "
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "paketti %s ei ole asennettu\n"
+
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "%s:n kirjoitus ei onnistu"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "silmukka edellytysten ketjussa: %s"
 
 #~ msgid ""
 #~ "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
@@ -4462,6 +4426,10 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgstr "paketilla ei ole nimeä"
 
 #, fuzzy
+#~ msgid "cannot create %s"
+#~ msgstr "en voinut avata tiedostoa %s: "
+
+#, fuzzy
 #~ msgid "Unable to stat icon: %s"
 #~ msgstr "%s:n kirjoitus ei onnistu"
 
diff --git a/po/fr.po b/po/fr.po
index 6e42d7335..6b12f6299 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,698 +1,698 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-11-07 07:55-0500\n"
+msgstr "POT-Creation-Date: 2000-12-12 13:07-0500\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Peut être redistribué librement selon les termes de la GNU GPL"
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 #, fuzzy
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 #, fuzzy
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 #, fuzzy
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "        -i                - affiche les informations relatives à un package"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "    -q                  - mode interrogation"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 #, fuzzy
 msgid "                        [--nomd5] [targets]"
 msgstr "    -q                  - mode interrogation"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 #, fuzzy
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 "                        - installe le package source, construit le package "
 "binaire,"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 #, fuzzy
 msgid "                           package1 ... packageN"
 msgstr "                          qui matchent <pkg>"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 #, fuzzy
 msgid "print this message"
 msgstr "   --help\t\t- affiche ce message"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 #, fuzzy
 msgid "print the version of rpm being used"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
 
-#: rpm.c:299
+#: rpm.c:300
 #, fuzzy
 msgid "    --pipe <cmd>          "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 #, fuzzy
 msgid "use <dir> as the top level directory"
 msgstr "      --root <dir>\t- utilise <dir> comme répertoire racine"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Options de spécification de package:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 #, fuzzy
 msgid "query package owning <file>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpm.c:336
+#: rpm.c:337
 #, fuzzy
 msgid "        -p <packagefile>+ "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:337
+#: rpm.c:338
 #, fuzzy
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Options de sélection d'information:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 #, fuzzy
 msgid "display package information"
 msgstr ""
 "        -i                - affiche les informations relatives à un package"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 #, fuzzy
 msgid "display package file list"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 #, fuzzy
 msgid "show file states (implies -l)"
 msgstr "        -s                - montre l'état des fichiers (implique -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 #, fuzzy
 msgid "list only documentation files (implies -l)"
 msgstr ""
 "        -d                - donne uniquement la liste des fichiers de "
 "documentation (implique -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 #, fuzzy
 msgid "list only configuration files (implies -l)"
 msgstr ""
 "        -c                - donne uniquement la liste des fichiers de "
 "configuration (implique -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 #, fuzzy
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "\t\t\t  mêmes options de spécification de package qu'avec -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpm.c:386
+#: rpm.c:387
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 #, fuzzy
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 #, fuzzy
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "      --hash            - affiche des '#' pendant l'installation du package "
 "(utile avec -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 #, fuzzy
 msgid "print percentages as package installs"
 msgstr ""
 "      --percent         - affiche des '%' pendant l'installation du package"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 #, fuzzy
 msgid "install even if the package replaces installed files"
 msgstr ""
 "      --replacefiles    - installe même si le package remplace des fichiers "
 "déjà présents"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 #, fuzzy
 msgid "reinstall if the package is already present"
 msgstr "      --replacepkgs      - réinstalle si le package est déjà présent"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 #, 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"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 #, fuzzy
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 "    -U <packagefile>\t- mise à jour du package (mêmes options que --install, "
 "plus)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 #, fuzzy
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
@@ -701,131 +701,131 @@ msgstr ""
 "      --oldpackage      - mise à jour par une ancienne version du package "
 "(--force"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 #, fuzzy
 msgid "build package, where <stage> is one of:"
 msgstr "    -b<stage> <spec>    - construit le package, <stage> peut valoir:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 #, fuzzy
 msgid "prep (unpack sources and apply patches)"
 msgstr "\t\t\t  p - prépare (extrait le source et applique les patches)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, fuzzy, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "\t\t\t  l - liste vérif (effectue quelques vérifications sur %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 #, fuzzy
 msgid "compile (prep and compile)"
 msgstr "\t\t\t  c - compile (prépare et compile)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 #, fuzzy
 msgid "install (prep, compile, install)"
 msgstr "\t\t\t  i - installe (prépare, compile, installe)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 #, fuzzy
 msgid "binary package (prep, compile, install, package)"
 msgstr "\t\t\t  b - package binaire (prépare, compile, installe, package)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 #, fuzzy
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "\t\t\t  a - package bin/src (prépare, compile, installe, package)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 #, fuzzy
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 "      --short-circuit   - passe directement à l'étape spécifiée (seulement "
 "pour c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 #, fuzzy
 msgid "remove build tree when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "      --sign            - genère une signature PGP"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:495
+#: rpm.c:496
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 "      --time-check <s>  - positionne l'intervalle de vérification à S "
 "secondes (0 le désactive)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 #, fuzzy
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
@@ -834,250 +834,250 @@ msgstr ""
 "                          et efface le fichier spec, les sources, les "
 "patches, et les icones."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "      --sign            - genère une signature PGP"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "un seul mode majeur peut être spécifié"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 #, fuzzy
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u et --uninstall sont obsolètes et seront bientôt supprimés.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Utilisez de préférence -e ou --erase.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 #, fuzzy
 msgid "relocations must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "un seul type de requête/vérification peut être effectué à la fois"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "source de requête inattendue"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "source de requête inattendue"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "source de requête inattendue"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "seules l'installation et la mise à jour peuvent être forcées"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr ""
 "--replacefiles ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "un seul mode majeur peut être spécifié"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--clean ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 #, fuzzy
 msgid "--prefix may only be used when installing new packages"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 #, fuzzy
 msgid "arguments to --prefix must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 #, fuzzy
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 #, fuzzy
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 #, fuzzy
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "un seul mode majeur peut être spécifié"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 #, fuzzy
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 #, fuzzy
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--percent ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 #, fuzzy
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--replacepkgs ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 "--replacefiles ne peut être spécifié que lors de l'installation d'un package"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 #, fuzzy
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
@@ -1086,7 +1086,7 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:916
+#: rpm.c:917
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1095,7 +1095,7 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1104,7 +1104,7 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 #, fuzzy
 msgid ""
 "--test may only be specified during package installation, erasure, and "
@@ -1113,7 +1113,7 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 #, fuzzy
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
@@ -1122,558 +1122,523 @@ msgstr ""
 "--root (-r) ne peut être spécifié que lors de l'installation, de la "
 "désinstallation ou de l'interrogation d'un package"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage ne peut être spécifié que lors de mises à jour"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 #, fuzzy
 msgid "--nopgp may only be used during signature checking"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 #, fuzzy
 msgid "pgp not found: "
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "La vérification du mot de passe a échoué\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Mot de passe correct.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign ne peut être spécifié que lors de la construction d'un package"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 #, fuzzy
 msgid "exec failed\n"
 msgstr "La construction a échoué.\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "aucun package n'a été spécifié pour la vérification de signature"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 #, fuzzy
 msgid "no packages given for signing"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 #, fuzzy
 msgid "extra arguments given for query of all packages"
 msgstr "aucun argument n'a été fourni pour la requête"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "aucun argument n'a été fourni pour la requête"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "aucun argument n'a été fourni pour la requête"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "aucun argument n'a été fourni pour la vérification"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "   --version\t\t- affiche la version de rpm utilisée"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr "        -a                - interroge l'ensemble des packages"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr "      --force           - raccourci pour --replacepkgs --replacefiles"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"        -i                - affiche les informations relatives à un package"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 "        -i                - affiche les informations relatives à un package"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "        -a                - interroge l'ensemble des packages"
 
-#: rpmqv.c:351
-#, fuzzy, c-format
+#: rpmqv.c:353
+#, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr "        -l                - affiche la liste des packages"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+msgstr ""
 
-#: rpmqv.c:352
-#, fuzzy, c-format
+#: rpmqv.c:354
+#, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
-msgstr "        -l                - affiche la liste des packages"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
+msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "        -l                - affiche la liste des packages"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "   --version\t\t- affiche la version de rpm utilisée"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Options de spécification de package:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Options de sélection d'information:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr ""
 "        -p <packagefile>+ - interroge le package (non installé) <packagefile>"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "    -i <packagefile>\t- installe le package"
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    --checksig <pkg>+  - vérifie la signature PGP"
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Utilisez de préférence -e ou --erase.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
@@ -1681,212 +1646,212 @@ msgstr ""
 "--test ne peut être spécifié que lors de l'installation ou désinstallation "
 "d'un package"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "aucun package n'a été spécifié pour la reconstruction"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 #, fuzzy
 msgid "no tar files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "La construction a échoué.\n"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, fuzzy, c-format
 msgid "Two files on one line: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:714
+#: build/files.c:715
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1896,7 +1861,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1922,488 +1887,503 @@ msgstr "La construction a échoué.\n"
 msgid "failed to write all data to %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, fuzzy, c-format
+msgid "Generating signature: %d\n"
+msgstr "      --sign            - genère une signature PGP"
+
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, fuzzy, c-format
-msgid "Generating signature: %d\n"
-msgstr "      --sign            - genère une signature PGP"
+msgid "Unable to open sigtarget %s: %s"
+msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, fuzzy, c-format
 msgid "Bad package specification: %s"
 msgstr "      Options de spécification de package:"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, fuzzy, c-format
 msgid "Bad source: %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "%s ne peut être construit sur cette architecture\n"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2418,183 +2398,183 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 #, fuzzy
 msgid " failed - "
 msgstr "La construction a échoué.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2623,57 +2603,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2689,127 +2669,113 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, fuzzy, c-format
 msgid "failed to stat %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, fuzzy, c-format
 msgid "failed to open %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 #, fuzzy
 msgid "unexpected ]"
 msgstr "source de requête inattendue"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 #, fuzzy
 msgid "unexpected }"
 msgstr "source de requête inattendue"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2824,583 +2790,582 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr "\t\t\t  b - package binaire (prépare, compile, installe, package)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "      --clean           - efface l'arborescence après construction"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 #, fuzzy
 msgid "query a spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 #, fuzzy
 msgid "query the pacakges triggered by the package"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 #, fuzzy
 msgid "list all configuration files"
 msgstr ""
 "        -c                - donne uniquement la liste des fichiers de "
 "configuration (implique -l)"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr ""
 "        -d                - donne uniquement la liste des fichiers de "
 "documentation (implique -l)"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "dump basic file information"
 msgstr ""
 "        -i                - affiche les informations relatives à un package"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "list files in package"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 #, fuzzy
 msgid "use the following query format"
 msgstr "source de requête inattendue"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr ""
 "        -f <file>+        - interroge le package à qui appartient <file>"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "        -l                - affiche la liste des packages"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, fuzzy, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 #, fuzzy
 msgid "not installed "
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a échoué.\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "La construction a échoué.\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3474,7 +3439,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "error(%d) removing record %s from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3485,519 +3450,513 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "impossible d'ouvrir: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
-#, fuzzy, c-format
+#: lib/rpmrc.c:621
+#, c-format
 msgid "Failed to read %s: %s."
-msgstr "impossible d'ouvrir: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
-#, fuzzy, c-format
+#: lib/rpmrc.c:808
+#, c-format
 msgid "bad option '%s' at %s:%d"
-msgstr "impossible d'ouvrir: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "      --sign            - genère une signature PGP"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#: lib/signature.c:157
-#, fuzzy
-msgid "New Header signature\n"
-msgstr "      --sign            - genère une signature PGP"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 #, fuzzy
 msgid "gpg failed"
 msgstr "La construction a échoué.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 #, fuzzy
 msgid "gpg failed to write signature"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "      --sign            - genère une signature PGP"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "      --sign            - genère une signature PGP"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -4024,213 +3983,221 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "    -i <packagefile>\t- installe le package"
+#~ msgid "New Header signature\n"
+#~ msgstr "      --sign            - genère une signature PGP"
+
+#, fuzzy
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "aucun package n'a été spécifié pour l'installation"
+
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
 #~ msgid ""
@@ -4331,6 +4298,10 @@ msgstr "impossible d'ouvrir: %s\n"
 #~ msgstr "aucun package n'a été spécifié pour l'installation"
 
 #, fuzzy
+#~ msgid "cannot create %s"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
 #~ msgid "Unable to stat icon: %s"
 #~ msgstr "impossible d'ouvrir: %s\n"
 
@@ -4397,6 +4368,11 @@ msgstr "impossible d'ouvrir: %s\n"
 #~ msgstr "--oldpackage ne peut être spécifié que lors de mises à jour"
 
 #, fuzzy
+#~ msgid ""
+#~ "                        [--provides] [--dump] [--dbpath <dir>] [targets]"
+#~ msgstr "        -a                - interroge l'ensemble des packages"
+
+#, fuzzy
 #~ msgid "   --help\t\t- print this message"
 #~ msgstr "   --help\t\t- affiche ce message"
 
diff --git a/po/gl.po b/po/gl.po
index 268c54c31..b6b43ac46 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 268c54c31..b6b43ac46 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 268c54c31..b6b43ac46 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 36448dfc0..9abdfdf22 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 1.37\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 2000-08-02 13:00+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,1710 +9,1670 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "get ekki opnağ %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "get ekki opnağ pakka gagnagrunn í\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "gat ekki útbúiğ pakkaskilyrği:\n"
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Get ekki opnağ spec skrána %s: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Gat ekki opnağ pípu í tar: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Gat ekki lesiğ spec skrá frá %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Gat ekki endurnefnt %s sem %s: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "gat ekki búiğ til %s: %s\n"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Skráin er ekki venjuleg skrá: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Skráin %s virğist ekki vera specskrá.\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Şıği fyrir markkerfi: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Şıği fyrir markkerfi %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM útgáfa %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Höfundarréttur (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Şessu má dreyfa frjálst samkvæmt skilmálum GNU GPL"
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr "Notkun: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <mappa>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <mappa>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <skrá>] [--ignorearch] [--dbpath <mappa>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <mappa>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 "                        [--ftpproxy <şjónn>] [--ftpport <gátt>] [--justdb]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <şjónn>] [--httpport <gátt>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate slóğ=nıslóğ]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <slóğ>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] skrá1.rpm ... skráN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <mappa>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <skrá>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <mappa>] [--prefix "
 "<mappa>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <şjónn>] [--httpport <gátt>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <slóğ>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        skrá1.rpm ... skráN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <mappa>] [--rcfile <skrá>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 "                        [--triggeredby] [--ftpport] [--ftpproxy <şjónn>]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <gátt>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <mappa>] [targets]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <mappa>] [--rcfile <skrá>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <mappa>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [target]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [target]"
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} skrá1.rpm ... skráN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <mappa>] [--noscripts] [--rcfile <skrá>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <mappa>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] pakki1 ... pakkiN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <skrá>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           pakki1 ... pakkiN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <skrá>] [--dbpath <mappa>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "prenta şessi skilaboğ"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "prenta útgáfunúmer rpm sem veriğ er ağ nota"
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr "   Allir hamir styğja eftirtalin viğföng:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<nafn> <gildi>'"
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr "skilgreina fjölva <nafn> meğ gildinu <gildi>"
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<nafn>+'      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr "prenta útvíkkun fjölva <nafn> á stağalfrálag"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <skipun>       "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "senda frálag í <skipun>"
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr "    --rcfile <skrá>       "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "nota <skrá> í stağ /etc/rpmrc og $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr "sına endanlega rpmrc og stillingar fjölva"
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "vera ağeins ítarlegri"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "vera hrikalega ítarlegur (fyrir aflúsun)"
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr "   Innsetningar, uppfærslur og fyrirspurnir (meğ -p) leyfa notkun URLa"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "   í stağ skráarnafna ásamt eftirfarandi rofum:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <şjónn>  "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "vélarheiti eğa IP vistfang ftp sels"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <gátt>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "gátt ftp şjónsins eğa selsins"
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <şjónn> "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr "vélarheiti eğa IP vistfang vefsels"
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr "      --httpport <gátt>   "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr "gátt vefşjónsins eğa vefselsins"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "fyrirspurnarhamur"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <mappa>    "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <mappa>      "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "fyrirspurn á alla pakka"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <skrá>+        "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "fyrirspurn á pakkann sem á <skrá>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <pakkaskrá>+ "
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "fyrirspurn á (fjarlægğann) package <pakkaskrá>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pakki>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <cap>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr "fyrirspurn á pakkana sem veita <cap> eiginleika"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <cap>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr "fyrirspurn á pakkana sem şarfnast <cap> eiginleika"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <pakkaskrá>"
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <pakkaskrá>        "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "setja inn pakka"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <slóğ>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <gömulslóğ>=<nıslóğ>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <mappa>    "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pakki>+"
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr "    -K <pakki>+           "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "    --define '<nafn> <gildi>'"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "prenta útvíkkun fjölva <nafn> á stağalfrálag"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
-#, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
-msgstr "       rpm {--rebuilddb} [--rcfile <skrá>] [--dbpath <mappa>]"
-
-#: rpmqv.c:303
+#: rpmqv.c:301
 #, c-format
-msgid ""
-"       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:306
-#, fuzzy
+#: rpmqv.c:305
+#, c-format
 msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+"       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
-"                        [--rcfile <skrá>] [--ignorearch] [--dbpath <mappa>]"
 
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+#: rpmqv.c:325
+#, c-format
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <skrá>]"
 
-#: rpmqv.c:323
-#, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+#: rpmqv.c:339
+#, c-format
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
-"       rpm {--erase -e} [--root <mappa>] [--noscripts] [--rcfile <skrá>]"
-
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr "                        [--scripts] [--root <mappa>] [--rcfile <skrá>]"
-
-#: rpmqv.c:337
-#, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
-msgstr "       rpm {--verify -V -y} [-afpg] [--root <mappa>] [--rcfile <skrá>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=kerfi1[,kerfi2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] specskrá"
 
-#: rpmqv.c:350
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "                        [--rmsource] [--rmspec] specskrá"
+#: rpmqv.c:352
+#, c-format
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
-#, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
-msgstr "       rpm {--resign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
+#: rpmqv.c:359
+#, c-format
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgstr ""
 
-#: rpmqv.c:358
-#, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
-msgstr "       rpm {--addsign} [--rcfile <skrá>] pakki1 pakki2 ... pakkiN"
+#: rpmqv.c:360
+#, c-format
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgstr ""
 
-#: rpmqv.c:359
-#, fuzzy, c-format
+#: rpmqv.c:361
+#, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
-"       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <skrá>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
-#, fuzzy
-msgid "   --eval '<expr>+'       "
-msgstr "    --eval '<nafn>+'      "
-
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "prenta útvíkkun fjölva <nafn> á stağalfrálag"
-
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-#, fuzzy
-msgid "   --macros <file:...>    "
-msgstr "    --rcfile <skrá>       "
+msgid "   --pipe <cmd>           "
+msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr "     -f <skrá>+           "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr "    -p <pakkaskrá>+       "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr "   -K <pakki>+           "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1722,7 +1682,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1748,486 +1708,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
 #, c-format
-msgid "Could not open %s: %s\n"
+msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:418
 #, c-format
-msgid "Unable to write package: %s"
+msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:455
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr ""
-
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
-msgstr ""
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "Get ekki opnağ spec skrána %s: %s\n"
 
 #: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
+msgstr "Gat ekki endurnefnt %s sem %s: %s\n"
+
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Get ekki opnağ spec skrána %s: %s\n"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Get ekki opnağ spec skrána %s: %s\n"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2242,182 +2217,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2446,57 +2421,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2512,125 +2487,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2645,546 +2606,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3258,7 +3218,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3269,511 +3229,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opnağ pakka gagnagrunn í\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "get ekki opnağ %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "get ekki opnağ index í %s"
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
-#, fuzzy, c-format
+#: lib/rpmrc.c:576
+#, c-format
 msgid "Unable to open %s for reading: %s."
-msgstr "Get ekki opnağ spec skrána %s: %s\n"
+msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
-#, fuzzy, c-format
+#: lib/rpmrc.c:621
+#, c-format
 msgid "Failed to read %s: %s."
-msgstr "gat ekki búiğ til %s: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
-#, fuzzy, c-format
+#: lib/rpmrc.c:701
+#, c-format
 msgid "cannot open %s at %s:%d: %s"
-msgstr "get ekki opnağ index í %s"
+msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
-#, fuzzy, c-format
+#: lib/rpmrc.c:808
+#, c-format
 msgid "bad option '%s' at %s:%d"
-msgstr "gat ekki búiğ til %s: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3800,205 +3755,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr "Óşekkt eğa óvænt villa"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== virkt %d tómt %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "+Oşekkt viğfang %c í %s(%s)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Fjölvi %%%.*s fanmst ekki. Sleppi"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "Skrá %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "Skráin %s er minni en %d bæti"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "banvæn villa: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "villa: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "ağvörun: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "minnisfrátekt (%u bæta) skilaği NULL.\n"
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "ağvörun: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "ağvörun: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "ağvörun: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lykilorğ fyrir %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "villa: %sport verğur ağ vera tala\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr "gátt slóğar verğur ağ vera tala\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "gat ekki opnağ %s: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "gat ekki búiğ til %s: %s\n"
diff --git a/po/it.po b/po/it.po
index 268c54c31..b6b43ac46 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index bd87e276d..f5ffab1b7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -14,59 +14,59 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: EUC-JP\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "°Í¸À­¤Î·çÇ¡:\n"
 
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "spec ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "tar ¥Ñ¥¤¥×¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "%s ¤«¤é spec ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "stat %s ¤Ë¼ºÇÔ: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "ÉáÄ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï ¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
@@ -88,431 +88,431 @@ msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.120 2000/11/07 13:16:44 jbj Exp $
-#: rpm.c:184 rpmqv.c:267
+# $Id: ja.po,v 1.121 2000/12/12 20:03:51 jbj Exp $
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ¥Ğ¡¼¥¸¥ç¥ó %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 "Ãøºî¸¢ (C) 1998 - Red Hat Software\n"
 "ËİÌõ¼Ô ¿ÀÅÄ ½¼ <kanda@nn.iij4u.or.jp>\n"
 "¸íÌõÅù¤Ï¿ÀÅĤޤÇ"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 #, fuzzy
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "GNU°ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Î²¼¤Ç¼«Í³¤ËÇÛÉۤǤ­¤Ş¤¹"
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "»ÈÍÑË¡: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "»ÈÍÑË¡:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ğ¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   °Ê²¼¤Î°ú¿ô¤Ï¤¹¤Ù¤Æ¤Î¥â¡¼¥É¤Ç»ÈÍѤǤ­¤Ş¤¹:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ğ¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "ɸ½à½ĞÎϤò <cmd> ¤Ø¥Ñ¥¤¥×¤·¤Ş¤¹"
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "/etc/rpmrc ¤È $HOME/.rpmrc ¤ÎÂå¤ê¤Ë <file> ¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "¤â¤¦¾¯¤·¾ğÊóɽ¼¨¤òÁı¤ä¤·¤Ş¤¹"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "½½Ê¬¤Ë¾ğÊóɽ¼¨¤òÁı¤ä¤·¤Ş¤¹(¥Ç¥Ğ¥Ã¥°ÍÑ)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr "¥Õ¥¡¥¤¥ë̾¤È°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ÎÂå¤ê¤Ë ftp URL ¤ò»È¤¨¤ë¤è¤¦(-p ¤òÍѤ¤¤Æ)"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢Ì䤤¹ç¤ï¤»¤·¤Ş¤¹:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "ftp ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp (¤â¤·¤¯¤Ï¥×¥í¥­¥·)¥µ¡¼¥Ğ¤Î¥İ¡¼¥ÈÈÖ¹æ"
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "http ¥×¥í¥­¥·¤Î¥Û¥¹¥È̾¤â¤·¤¯¤Ï IP"
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "http (¤â¤·¤¯¤Ï¥×¥í¥­¥·)¥µ¡¼¥Ğ¤Î¥İ¡¼¥ÈÈÖ¹æ"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤΥǥ£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤òÍѤ¤¤Ş¤¹"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "¥Ø¥Ã¥À¥Õ¥©¡¼¥Ş¥Ã¥È¤È¤·¤Æ <qfmt> ¤ò»ÈÍѤ·¤Ş¤¹ (-i ¤ÎƯ¤­¤ò´Ş¤ß¤Ş¤¹)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤È¤·¤Æ <dir> ¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      ¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "<file> ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 "(̤¥¤¥ó¥¹¥È¡¼¥ë)¥Ñ¥Ã¥±¡¼¥¸ <packagefile> ¤ò\n"
 "Ì䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr "<cap> ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 "<cap> ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
 "Ì䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      ¾ğÊóÁªÂò¥ª¥×¥·¥ç¥ó:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¾ğÊó¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÊѹ¹ÍúÎò¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Ş¤Ş¤ì¤ë¥Õ¥¡¥¤¥ë¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Ş¤Ş¤ì¤ë¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Ş¤¹(-l ¤ÎƯ¤­¤ò´Ş¤ß¤Ş¤¹)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Ş¤Ş¤ì¤ëʸ½ñ¥Õ¥¡¥¤¥ë¤Î¤ß¤Î¾õÂÖ¤òɽ¼¨¤·\n"
 "\t\t\t     ¤Ş¤¹(-l ¤ÎƯ¤­¤ò´Ş¤ß¤Ş¤¹)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Î¤ß¤òɽ¼¨¤·¤Ş¤¹(-l ¤ÎƯ¤­¤ò´Ş¤ß¤Ş¤¹)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -520,25 +520,25 @@ msgstr ""
 "¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú²Äǽ¤ÊÁ´¾ğÊó¤òɽ¼¨¤·¤Ş¤¹(-l¡¢\n"
 "-c¡¢-d ¤Î¤¤¤º¤ì¤«¤È¶¦¤ËÍѤ¤¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸Ì¾¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "[¥¢¥ó]¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Ş¤Ş¤ì¤ë¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Ş\n"
 "\t\t\t       ¤¹"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -546,155 +546,155 @@ msgstr ""
 "-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
 "¥¤¥ó¥¹¥È¡¼¥ë¤Î¾õ¶·¤ò¸¡¾Ú¤·¤Ş¤¹"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "¥Õ¥¡¥¤¥ë¤Î md5 ¥Á¥§¥Ã¥¯¥µ¥à¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "¥Õ¥¡¥¤¥ë°À­¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 "Ì䤤¹ç¤ï¤»¥Õ¥©¡¼¥Ş¥Ã¥ÈÃæ¤ËÍѤ¤¤é¤ìÆÀ¤ë¥¿¥°¤ò\n"
 "\t\t\t      ɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 #, fuzzy
 msgid "skip files in path <path>"
 msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Ş¤¹"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 "ºÆÇÛÃÖ²Äǽ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤ËÂФ·¡¢¥¤¥ó¥¹¥È¡¼¥ë¥Ñ¥¹\n"
 "ÀÜƬ¼­¤ò <dir> ¤ËÀßÄꤷ¤Ş¤¹"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤»¤ó"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs ¤È --replacefiles ¤òû½Ì¤·¤¿¤â¤Î"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºİ¤Ë '#' ¤Çɽ¼¨¤·¤Ş¤¹(-v ¤ò»ÈÍѤ¹¤ë¤ÈÎɤ¤)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr "ÀßÄê¤ò¥¹¥­¥Ã¥×¤·¡¢Á´¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ÎÂоݥ¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë¥Ç¥£¥¹¥¯¤ÎÍÆÎÌ¥Á¥§¥Ã¥¯¤ò¤·¤Ş¤»¤ó"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ÂоİOS¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Ş¤¹¤¬¡¢\n"
 "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÊѹ¹¤·¤Ş¤»¤ó"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "°Í¸À­¤òËş¤¿¤¹¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î\n"
 "¥¤¥ó¥¹¥È¡¼¥ë¤òÍ׵ᤷ¤Ş¤»¤ó"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
 "¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºİ¤Ë '%' ¤Çɽ¼¨¤·¤Ş¤¹"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 "¥¤¥ó¥¹¥È¡¼¥ë»ş¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤¬\n"
 "¤¢¤Ã¤Æ¤â¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "´û¤Ë¸ºß¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ç¤âºÆ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤»¤º¤Ë¡¢¥Æ¥¹¥È¤Î¤ß¹Ô¤¤¤Ş¤¹"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Ş¤¹(--install "
 "¤È´ö¤Ä¤«¤Î¥ª¥×¥·¥ç¥ó¤òÉÕ¤±Â­¤·¤¿¤â¤Î)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -702,15 +702,15 @@ msgstr ""
 "¸Å¤¤¥Ğ¡¼¥¸¥ç¥ó¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Ş¤¹\n"
 "(¥¢¥Ã¥×¥°¥ì¡¼¥É»ş¤Î --force ¤Ï¤³¤ì¤ò¼«Æ°Åª¤Ë¹Ô¤¤¤Ş¤¹)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü(¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë)¤·¤Ş¤¹"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -718,103 +718,103 @@ msgstr ""
 "<package> ¤È°ìÃפ¹¤ë¥Ñ¥Ã¥±¡¼¥¸Á´¤Æ¤òºï½ü¤·¤Ş¤¹(°ìÈÌ\n"
 "\t\t\t      Ū¤ËÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤹ¤ë¤È¥¨¥é¡¼¤Ë¤Ê¤ê¤Ş¤¹)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸»ØÄê¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤·¤Ş¤¹¡¢<stage> ¤Ï°Ê²¼¤Î¤¦¤Á¤Ò¤È¤Ä¤Ç¤¹:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (¥½¡¼¥¹¤òŸ³«¤·¥Ñ¥Ã¥Á¤òÅö¤Æ¤Ş¤¹)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "¥ê¥¹¥È¸¡ºº (%files ¥»¥¯¥·¥ç¥ó¤ÎÂ礪¤«¤Ê¥Á¥§¥Ã¥¯)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "¥³¥ó¥Ñ¥¤¥ë (prep¡¢compile)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë (prep¡¢compile¡¢install)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "¥Ğ¥¤¥Ê¥ê¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "¥Ğ¥¤¥Ê¥ê/¥½¡¼¥¹¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "»ØÄꤷ¤¿²áÄø¤Ş¤Ç¥¹¥­¥Ã¥×¤·¤Ş¤¹ (c¡¢i ¤Ç¤Î¤ßÍ­¸ú)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¸åºîÀ®¥Ä¥ê¡¼¤òºï½ü¤·¤Ş¤¹"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "½ªÎ»¸å¥½¡¼¥¹¤òºï½ü¤·¤Ş¤¹"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "½ªÎ»¸å¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ş¤¹"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP/GPG ½ğ̾¤òÀ¸À®¤·¤Ş¤¹"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "BuildRoot ¤È¤·¤Æ <dir> ¤òÍѤ¤¤Ş¤¹"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "¥¿¥¤¥à¥Á¥§¥Ã¥¯´ü¸Â¤òÀßÄꤷ¤Ş¤¹(0¤Ç̵¸ú)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -823,64 +823,64 @@ msgstr ""
 "\t\t\t     ¥¸¤òºîÀ®¤·¡¢spec¥Õ¥¡¥¤¥ë¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ë¡¢¥Ñ¥Ã¥Á¡¢\n"
 "\t\t\t     ¥¢¥¤¥³¥ó¤òºï½ü¤·¤Ş¤¹"
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "--rebuild ¤Ë»÷¤Æ¤¤¤Ş¤¹¤¬¡¢¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤·¤Ş¤»¤ó"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ğ̾¤·¤Ş¤¹(¸½ºß¤Î½ğ̾¤Ï¼Î¤Æ¤é¤ì¤Ş¤¹)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ğ̾¤òÄɲ䷤ޤ¹"
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "½ğ̾¤Î¸¡¾Ú¤ò¤·¤Ş¤¹"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "PGP ½ğ̾¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "GPG ½ğ̾¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "MD5 ½ğ̾¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "Í­¸ú¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬Â¸ºß¤¹¤ë¤³¤È¤ò³Î¤«¤á¤Ş¤¹"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "´û¸¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Ş¤¹"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -888,7 +888,7 @@ msgstr ""
 "-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
 "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Îµö²Ä°À­¤ËÀßÄꤷ¤Ş¤¹"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -896,85 +896,85 @@ msgstr ""
 "-q ¤ÈƱÍͤËƱ¤¸¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó¤ò¼è¤ê\n"
 "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î½êÍ­¼Ô¤È¥°¥ë¡¼¥×¤ËÀßÄꤷ¤Ş¤¹"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "°ì¤Ä¤Î¥á¥¸¥ã¡¼¥â¡¼¥É¤Î¤ß¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ¤È --uninstall ¤Ï¤â¤Ï¤äÆ°ºî¤·¤Ş¤»¤ó\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "ºÆÇÛÃÖ¤Ï / ¤«¤é»Ï¤Ş¤é¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "ºÆÇÛÃÖ¤Ï = ¤ò´Ş¤ó¤Ç¤¤¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "ºÆÇÛÃÖ¤Ï = ¤Î¼¡¤Ë / ¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "½ü³°¤¹¤ë¥Ñ¥¹¤Ï / ¤«¤é»Ï¤Ş¤é¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, fuzzy, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "°ú¿ô½èÍı(%d)¤Ç¤ÎÆâÉô¥¨¥é¡¼ :-(\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "Ì䤤¹ç¤ï¤»/¸¡¾Ú¤Ï°ìÅ٤˰ì¤Ä¤·¤«¼Â¹Ô¤Ç¤­¤Ş¤»¤ó"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥é¥°"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥Õ¥©¡¼¥Ş¥Ã¥È"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "ͽ´ü¤»¤ÌÌ䤤¹ç¤ï¤»¤Î¥½¡¼¥¹"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢¥½¡¼¥¹ºï½ü¡¢¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ëºï½ü»ş¤Î¤ß¶¯À©¤Ç¤­¤"
 "ޤ¹"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "¥Õ¥¡¥¤¥ë¤Ï¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ßºÆÇÛÃ֤Ǥ­¤Ş¤¹"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ¤â¤·¤¯¤Ï --relocate ¤Î¤¤¤º¤ì¤«¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
@@ -982,80 +982,80 @@ msgstr ""
 "--relocate ¤È --excludepath "
 "¤Ï¿·¤·¤¤¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix ¤Ï¿·µ¬¤Ë¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¤­¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix ¤Ø¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Ş¤é¤Í¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "--excludedocs ¤È --includedocs ¤Ï¤É¤Á¤é¤«°ìÊı¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "-ignoreos ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "-ignoresize ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr "--noscripts ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr "--notriggers ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1063,13 +1063,13 @@ msgid ""
 msgstr ""
 "--nodeps ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤ÎºîÀ®¡¢¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢¸¡¾Ú»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢ºîÀ®»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1077,752 +1077,721 @@ msgstr ""
 "--root (-r) "
 "¤Ï¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü¡¢Ì䤤¹ç¤ï¤»¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹ºÆ¹½ÃÛ»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) ¤Î°ú¿ô¤Ï / ¤«¤é»Ï¤Ş¤é¤Í¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage ¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É»ş¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp ¤Ï½ğ̾¸¡ºº»ş¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg ¤Ï½ğ̾¸¡ºº»ş¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 ¤Ï½ğ̾¸¡ºº¤È¥Ñ¥Ã¥±¡¼¥¸¸¡¾Ú»ş¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr "½ğ̾¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó\n"
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ş¤»¤ó\n"
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 #, fuzzy
 msgid "pgp not found: "
 msgstr "pgp ¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆşÎϤ·¤Æ¤¯¤À¤µ¤¤: "
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¥Á¥§¥Ã¥¯¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÀµ¾ï¤Ç¤¹¡¥\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»ş¤Î¤ß»ÈÍѤǤ­¤Ş¤¹"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr "¼Â¹Ô¼ºÇÔ\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Ş¤¹"
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "½ğ̾¸¡ºº¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "½ğ̾¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¤ÎÌ䤤¹ç¤ï¤»¤Î¤¿¤á¤Ë;ʬ¤Ê°ú¿ô¤¬¤¢¤ê¤Ş¤¹"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¤Î¸¡¾Ú¤Î¤¿¤á¤Ë;ʬ¤Ê°ú¿ô¤¬¤¢¤ê¤Ş¤¹"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 #, fuzzy
 msgid "argument is not an RPM package\n"
 msgstr "°ú¿ô¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤«¤é¥Ø¥Ã¥À¤ÎÆɤ߹ş¤ß¤Î¥¨¥é¡¼\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ğ¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "»ÈÍÑË¡: rpm {--help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   °Ê²¼¤Î°ú¿ô¤Ï¤¹¤Ù¤Æ¤Î¥â¡¼¥É¤Ç»ÈÍѤǤ­¤Ş¤¹:"
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
+msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "»ÈÍѤ·¤Æ¤¤¤ë rpm ¤Î¥Ğ¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¤Ş¤¹"
-
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr "¥Õ¥¡¥¤¥ë̾¤È°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ÎÂå¤ê¤Ë ftp URL ¤ò»È¤¨¤ë¤è¤¦(-p ¤òÍѤ¤¤Æ)"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢Ì䤤¹ç¤ï¤»¤·¤Ş¤¹:"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      ¥Ñ¥Ã¥±¡¼¥¸»ØÄꥪ¥×¥·¥ç¥ó:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Á´¤Æ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "<file> ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 "(̤¥¤¥ó¥¹¥È¡¼¥ë)¥Ñ¥Ã¥±¡¼¥¸ <packagefile> ¤ò\n"
 "Ì䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "<pkg> ¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "<cap> ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 "<cap> ¤Îµ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
 "Ì䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      ¾ğÊóÁªÂò¥ª¥×¥·¥ç¥ó:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬Ä󶡤¹¤ëµ¡Ç½¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "[¥¢¥ó]¥¤¥ó¥¹¥È¡¼¥ë»ş¤Î¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Ş¤¹"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ë´Ş¤Ş¤ì¤ë¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¤òɽ¼¨¤·¤Ş\n"
 "\t\t\t       ¤¹"
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "¥Ñ¥¹ <path> Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò\n"
 "¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "<oldpath> ¤«¤é <newpath> ¤Ë¥Õ¥¡¥¤¥ë¤òºÆÇÛÃÖ¤µ¤»¤Ş¤¹"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë̾Á°¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "´û¸¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Ş¤¹"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "-e ¤« --erase ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤ·¤Ê¤¤¤Î¤Ë --dbpath ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ş¤¹"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ºï½ü»ş¤Î¤ß»ØÄê¤Ç¤­¤Ş¤¹"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "°ì»ş¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó"
 
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "¼Â¹ÔÃæ: %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "%s ¤Î¼Â¹Ô¤Ë¼ºÇÔ (%s)"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr "%s ¤ÎÉÔÀµ¤Ê½ªÎ»¥¹¥Æ¡¼¥¿¥¹ (%s)"
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr "¹½Ê¸²òÀÏÃæ¤Îʸˡ¥¨¥é¡¼ =="
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr "¹½Ê¸²òÀÏÃæ¤Îʸˡ¥¨¥é¡¼ &&"
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr "¹½Ê¸²òÀÏÃæ¤Îʸˡ¥¨¥é¡¼ ||"
 
-#: build/expression.c:286
+#: build/expression.c:287
 #, fuzzy
 msgid "parse error in expression"
 msgstr "¼°Ãæ¤Ç¹½Ê¸²òÀÏ¥¨¥é¡¼"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr "°ìÃפ·¤Ê¤¤ ("
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr "- ¿ô¤Î¤ß"
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr "! ¿ô¤Î¤ß"
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr "·¿¤Ï°ìÃפ·¤Æ¤¤¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr "* / ¤Ïʸ»úÎóÍѤ˥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr "- ¤Ïʸ»úÎóÍѤ˥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr "&& ¤È || ¤Ïʸ»úÎóÍѤ˥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 #, fuzzy
 msgid "syntax error in expression"
 msgstr "¼°Ãæ¤Çʸˡ¥¨¥é¡¼"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK ¼ºÇÔ: %s\n"
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s"
 msgstr "%s %s ¤Ç '('¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "')' ¤¬¤¢¤ê¤Ş¤»¤ó %s(%s "
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr "̵¸ú¤Ê %s ¤Î¥È¡¼¥¯¥ó: %s"
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr "%s() ¤Ë³¤¯¶õÇò¤¬¤¢¤ê¤Ş¤»¤ó: %s"
 
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "ÉÔÀµ¤Êʸˡ: %s(%s)"
 
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "ÉÔÀµ¤Ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)"
 
-#: build/files.c:408
+#: build/files.c:409
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr "ÉÔÀµ¤Ê¥Ç¥£¥ì¥¯¥È¥ê¥â¡¼¥É¥¹¥Ú¥Ã¥¯: %s(%s)"
 
-#: build/files.c:532
+#: build/files.c:533
 #, fuzzy
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr "°Û¾ï¤Ê¥í¥«¡¼¥ëĹ: \"%.*s\"  %%lang(%s)"
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr "Ê£¿ô¤Î¥í¥«¡¼¥ë %.*s %%lang(%s)"
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr "%%docdir ¤Î¸Â³¦¤Ë㤷¤Ş¤·¤¿"
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr "%%docdir ¤Î°ú¿ô¤Ï1¤Ä¤Î¤ß¤Ç¤¹"
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr "1¹Ô¤Ë2¤Ä¤Î¥Õ¥¡¥¤¥ë: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "¥Õ¥¡¥¤¥ë¤Ï \"/\" ¤«¤é»Ï¤Ş¤é¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó: %s"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr "¾¤Î¥Õ¥©¡¼¥à¤ÇÆÃÊÌ¤Ê %%doc ¤òº®¤¼¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr "¥Õ¥¡¥¤¥ë¤¬2²óɽµ­¤µ¤ì¤Æ¤¤¤Ş¤¹: %s"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Ş¤»¤ó: %s"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó: %s"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s\n"
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "¥Õ¥¡¥¤¥ë¤ÏÀèƬ¤Ë \"/\" ¤¬É¬ÍפǤ¹: %s"
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó(by glob): %s"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "¹ÔÌÜ: %s"
@@ -1832,7 +1801,7 @@ msgstr "¹ÔÌÜ: %s"
 msgid "Bad file: %s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s"
@@ -1858,489 +1827,504 @@ msgstr "%s ¼ºÇÔ"
 msgid "failed to write all data to %s"
 msgstr "Á´¤Æ¤Î¥Ç¡¼¥¿¤ò %s ¤Ë½ñ¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "%s ¤òõ¤·¤Æ¤¤¤Ş¤¹: (%s ¤ò»ÈÍѤ·¤Æ¤¤¤Ş¤¹)...\n"
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿:"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍıÃæ: %s-%s-%s\n"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "¥Û¥¹¥È̾¤òÀµ¼°¤Ê¤â¤Î¤Ë¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s"
 msgstr "cpio_copy ¤Ç½ñ¤­¹ş¤ß¼ºÇÔ: %s"
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "cpio_copy ¤ÇÆɤ߹ş¤ß¼ºÇÔ: %s"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "PreIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "PreUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "PostIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "PostUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr "VerifyScript ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr "¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s ¤Î¥ª¡¼¥×¥ó: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s ¤ÎÆɤ߹ş¤ß: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹ş¤ß\n"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿"
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr "½ğ̾¤ÎÀ¸À®Ãæ: %d\n"
+
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:445
-#, c-format
-msgid "Generating signature: %d\n"
-msgstr "½ğ̾¤ÎÀ¸À®Ãæ: %d\n"
-
-#: build/pack.c:458
+#: build/pack.c:470
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "sigtarget ¤ÎÆɤ߹ş¤ß¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:465
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr "sigtarget ¤ÎÆɤ߹ş¤ß¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
+msgid "Unable to read header from %s: %s"
+msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/pack.c:471
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:494
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹ş¤ßÃæ: %s\n"
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ĞÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%s"
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr "%%chagelog ¥¨¥ó¥È¥ê¤Ï * ¤Ç»Ï¤Ş¤é¤Í¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr "ÉÔ´°Á´¤Ê %%changelog ¥¨¥ó¥È¥ê"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr "%%changelog Ãæ¤ÎÉÔÀµ¤ÊÆüÉÕ: %s"
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr "%%changelog ¤Ï½½¿Ê¿ô¤ÎǯÂå½ç¤Ë¤Ê¤Ã¤Æ¤¤¤Ş¤»¤ó"
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr "%%changelog Ãæ¤Ë̾Á°¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr "%%changelog Ãæ¤ËÀâÌÀ¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr "%d ¹ÔÌÜ: %%description ¤Î²òÀÏ¥¨¥é¡¼: %s"
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó %s:%s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr "%d ¹ÔÌÜ: ̾Á°¤¬Â¿¤¹¤®¤Ş¤¹: %s"
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "%d ¹ÔÌÜ: ¥Ñ¥Ã¥±¡¼¥¸¤¬Â¸ºß¤·¤Ş¤»¤ó: %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤÎÀâÌÀ"
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr "%d ¹ÔÌÜ: %%files ¤Î²òÀÏ¥¨¥é¡¼: %s"
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%%files ¥ê¥¹¥È"
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr "¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Ş¤¹: %s"
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr "¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï´Ş¤Ş¤ì¤Æ¤¤¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Ş¤¹: %s"
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr "OS ¤Ï´Ş¤Ş¤ì¤Æ¤¤¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr "%s ¥Õ¥£¡¼¥ë¥É¤Ï¥Ñ¥Ã¥±¡¼¥¸Ãæ¤ËɬÍפǤ¹: %s"
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤ÎÆó½Å¤Î %s ¥¨¥ó¥È¥ê: %s"
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr "ÉÔÌÀ¤Ê¥¢¥¤¥³¥ó¥¿¥¤¥×: %s"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔ´°Á´¤Ê·Á¤Î¥¿¥°: %s"
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr "%d ¹ÔÌÜ: ¶õ¤Î¥¿¥°: %s"
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "%d ¹ÔÌÜ: %s Ãæ¤ËÉÔÀµ¤Êʸ»ú '-' : %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "%d ¹ÔÌÜ: BuildRoot ¤Ï \"/\" ¤Ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr "%d ¹ÔÌÜ: Prefixes ¤Ï \"/\" ¤Ç½ª¤ï¤Ã¤Æ¤Ï¤¤¤±¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "%d ¹ÔÌÜ: Docdir ¤Ï '/' ¤Ç»Ï¤Ş¤é¤Ê¤¯¤Æ¤Ï¤¤¤±¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "%d ¹ÔÌÜ: Epoch/Serial ¥Õ¥£¡¼¥ë¥É¤ÏÈÖ¹æ¤Ç¤Ê¤±¤ì¤Ğ¤¤¤±¤Ş¤»¤ó: %s"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %s ÈÖ¹æ: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê BuildArchitecture ¥Õ¥©¡¼¥Ş¥Ã¥È: %s"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr "ÆâÉô¥¨¥é¡¼: ¤Ë¤»¤Î¥¿¥° %d"
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr "ÉÔÀµ¤Ê¥Ñ¥Ã¥±¡¼¥¸¤Î»ØÄê: %s"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Ş¤¹: %s"
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÌÀ¤Ê¥¿¥°: %s"
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ï BuildRoot ¤ò»ÈÍѤǤ­¤Ş¤»¤ó"
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr "ÉÔÀµ¤Ê¥½¡¼¥¹: %s : %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr "¥Ñ¥Ã¥ÁÈÖ¹æ %d ¤Ï¤¢¤ê¤Ş¤»¤ó"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr "¥½¡¼¥¹ÈÖ¹æ %d ¤Ï¤¢¤ê¤Ş¤»¤ó"
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "nosource %s ¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr "%%setup ¤Î¹½Ê¸²òÀÏ¥¨¥é¡¼: %s"
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "%d ¹ÔÌÜ: %%setup %c ¤Ø¤ÎÉÔÀµ¤Ê°ú¿ô: %s"
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%setup ¥ª¥×¥·¥ç¥ó %s: %s"
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "%d ¹ÔÌÜ: %%patch -b ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s"
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "%d ¹ÔÌÜ: %%patch -z ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s"
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "%d ¹ÔÌÜ: %%patch -p ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %s"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %%patch -p ¤Ø¤Î°ú¿ô: %s"
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr "¥Ñ¥Ã¥Á¤¬Â¿¤¹¤®¤Ş¤¹"
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "%d ¹ÔÌÜ: %%patch ¤Ø¤ÎÉÔÀµ¤Ê°ú¿ô: %s"
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%%prep"
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 "%d ¹ÔÌÜ: °Í¸À­¥È¡¼¥¯¥ó¤Ï±Ñ¿ô»ú¡¢'_'¡¢'/' ¤Ç»Ï¤Ş¤é¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó: %s"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, fuzzy, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "%d ¹ÔÌÜ: ¥Õ¥¡¥¤¥ë̾¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "%d ¹ÔÌÜ: ¥Ğ¡¼¥¸¥ç¥óÉÕ¤±¤µ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "%d ¹ÔÌÜ: ¥Ğ¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr "%d ¹ÔÌÜ: ¥È¥ê¥¬¡¼¤Ï -- ¤¬¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó: %s"
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr "%d ¹ÔÌÜ: %s ¤Î¹½Ê¸²òÀÏ¥¨¥é¡¼: %s"
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr "%d ¹ÔÌÜ: ¥¹¥¯¥ê¥×¥È¥×¥í¥°¥é¥à¤Ï '/' ¤Ç»Ï¤Ş¤é¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó: %s"
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%s"
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr "%d ¹ÔÌÜ: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr "%%if ¤¬ÊĤ¸¤Æ¤¤¤Ş¤»¤ó"
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s%d: parseExpressionBoolean ¤¬ %d ¤òÊÖ¤·¤Ş¤·¤¿"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 #, fuzzy
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: if ¤¬¤Ê¤¤¤Î¤Ë %%else ¤¬¤¢¤ê¤Ş¤¹"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 #, fuzzy
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: if ¤¬¤Ê¤¤¤Î¤Ë %%endif ¤¬¤¢¤ê¤Ş¤¹"
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr "¤ª¤«¤·¤Ê %%include ¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ç¤¹"
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr "ºîÀ®(build)²Äǽ¤Ê¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¤¢¤ê¤Ş¤»¤ó"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï %%description ¤¬¤¢¤ê¤Ş¤»¤ó: %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr "¥¢¡¼¥«¥¤¥Ö = %s, fs = %s\n"
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤ÊÈÖ¹æ: %s"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê no%s ÈÖ¹æ: %d"
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê %s ÈÖ¹æ: %s\n"
@@ -2355,53 +2339,53 @@ msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤¬¤Ç¤­¤Ş¤»¤ó: %s\n"
 msgid "can't unlink %s: %s\n"
 msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "(¥¨¥é¡¼ 0x%x)"
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr "ÉÔÀµ¤Ê¥Ş¥¸¥Ã¥¯"
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr "ÉÔÀµ¤Ê/ÉÔ²ÄÆɤʥإåÀ"
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Ş¤¹"
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 #, fuzzy
 msgid "Unknown file type"
 msgstr "ÉÔÌÀ¤Ê¥Õ¥¡¥¤¥ë¥¿¥¤¥×"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr "¥Ï¡¼¥É¥ê¥ó¥¯¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó"
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 #, fuzzy
 msgid "Internal error"
 msgstr "ÆâÉô¥¨¥é¡¼"
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 #, fuzzy
 msgid " failed - "
 msgstr "¼ºÇÔ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2410,132 +2394,132 @@ msgstr ""
 "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Ş¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤¹: %s\n"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Ş¤»¤ó"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "¶¦Í­"
 
@@ -2564,57 +2548,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, fuzzy, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, fuzzy, c-format
 msgid "removed db environment %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, fuzzy, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Ş¤»¤ó"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
@@ -2635,125 +2619,112 @@ msgstr ""
 "¾ÜºÙ¤Ê¾ğÊ󤬼èÆÀ¤Ç¤­¤Ş¤¹¡£\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr "mntctl() fugger ¥µ¥¤¥º¤òÊÖ¤¹¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr "stat %s ¤Ë¼ºÇÔ: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr "¥Ş¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ÏÉÔÌÀ¤Ê¥Ç¥Ğ¥¤¥¹¤Ç¤¹"
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
+#, fuzzy
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó¡£\n"
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "headerAddEntry() ¤ÎÉÔÀµ¤Ê¥«¥¦¥ó¥È: %d\n"
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "% ¤Î¸å¤Ë { ¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "%{ ¤Î¸å¤Ë } ¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "¶õ¤Î¥¿¥°¥Õ¥©¡¼¥Ş¥Ã¥È"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "¶õ¤Î¥¿¥°Ì¾"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "ÉÔÌÀ¤Ê¥¿¥°"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "ÇÛÎó¤Î¸å¤Ë ] ¤¬´üÂÔ¤µ¤ì¤Ş¤¹"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "ͽ´ü¤»¤Ì ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "ͽ´ü¤»¤Ì }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "¼°Ãæ¤Ç ? ¤¬´üÂÔ¤µ¤ì¤Ş¤¹"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr "¼°Ãæ¤Ç ? ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Ş¤¹"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "¼°Ãæ¤Ë } ¤¬´üÂÔ¤µ¤ì¤Ş¤¹"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr "°Ê²¼¤Î ? ¥µ¥Ö¼°¤Î ¤Ë: ¤¬´üÂÔ¤µ¤ì¤Ş¤¹"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr "¼°Ãæ¤Ç : ¤Î¸å¤Ë { ¤¬´üÂÔ¤µ¤ì¤Ş¤¹"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "¼°¤Î½ª¤ê¤Ë | ¤¬´üÂÔ¤µ¤ì¤Ş¤¹"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: ¥¢¥¯¥·¥ç¥ó: %s\n"
@@ -2768,7 +2739,7 @@ msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
 msgid "group %s does not exist - using root"
 msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: lib/install.c:255
+#: lib/install.c:256
 #, fuzzy
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
@@ -2778,585 +2749,584 @@ msgstr ""
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/install.c:658
+#: lib/install.c:666
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr "%s ¤Ø½ñ¤­¹ş¤á¤Ş¤»¤ó"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr "¥½¡¼¥¹¤Ï: %s\n"
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec ¥Õ¥¡¥¤¥ë¤Ï: %s\n"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Ş¤¹\n"
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s ¤ò %s ¤Ë¤¹¤ë̾Á°¤ÎÊѹ¹¤Ë¼ºÇÔ: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Ş¤¹¡¢¥Ğ¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Ş¤·¤¿"
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr "--test ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤òÃæ»ß¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr "¥×¥ê¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Ş¤¹"
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆÊݸ¤µ¤ì¤Ş¤¹"
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr "¥Ó¥ë¥É¥ë¡¼¥È¤Ï¤¹¤Ç¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤­´¹¤¨¤Ş¤¹"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Ş¤·¤¿\n"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Ş¤·¤¿\n"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr "¥Ğ¥¤¥Ê¥ê¤ò¥Ñ¥Ã¥±¡¼¥¸²½ (prep¡¢compile¡¢install¡¢package)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 #, fuzzy
 msgid "override build root"
 msgstr "¥Ó¥ë¥É¥ë¡¼¥È¤ò¾å½ñ¤­¤·¤Ş¤¹"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "ºîÀ®¤¹¤ë¤¿¤á¤Î¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤«¤é I18N ¤Ê msgstr ¤ò¼õ¤±Æş¤ì¤Ş¤»¤ó"
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "½ªÎ»¸å¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ş¤¹"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr "¥¿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ò¾å½ñ¤­¤·¤Ş¤¹"
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¥«¥¿¥í¥°Ãæ¤Î I18N ʸ»úÎó¤òõ¤·¤Æ¤¤¤Ş¤¹"
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "<file> ¤ò½êÍ­¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "¥°¥ë¡¼¥×Ãæ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹\n"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 #, fuzzy
 msgid "query a spec file"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 #, fuzzy
 msgid "query the pacakges triggered by the package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤Æ¥È¥ê¥¬¡¼¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "Ì䤤¹ç¤ï¤»¥â¡¼¥É"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 #, fuzzy
 msgid "query the packages which require a capability"
 msgstr ""
 "µ¡Ç½¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤Æ\n"
 "Ì䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 #, fuzzy
 msgid "query the packages which provide a capability"
 msgstr "µ¡Ç½¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ä¤¤¤ÆÌ䤤¹ç¤ï¤»¤Ş¤¹"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 #, fuzzy
 msgid "list all configuration files"
 msgstr "Á´¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Ş¤¹"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr "Á´¤Æ¤Î¥É¥­¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Ş¤¹"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "dump basic file information"
 msgstr "´ğËÜŪ¤Ê¥Õ¥¡¥¤¥ë¾ğÊó¤ò¥À¥ó¥×¤·¤Ş¤¹"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "list files in package"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤òÎóµó¤·¤Ş¤¹\n"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr "°Ê²¼¤ÎÌ䤤¹ç¤ï¤»¥Õ¥©¡¼¥Ş¥Ã¥È¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "°Ê²¼¤Î¥«¥¿¥í¥°¤«¤é i18n ¥»¥¯¥·¥ç¥ó¤òÃÖ¤­´¹¤¨¤Ş¤¹"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Ş¤¹"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Ş¤¹"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n"
 
-#: lib/problems.c:103
-#, c-format
-msgid "package %s-%s-%s is for a different architecture"
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸ş¤±¤Ç¤¹"
 
-#: lib/problems.c:108
-#, c-format
-msgid "package %s-%s-%s is for a different operating system"
+#: lib/problems.c:103
+#, fuzzy, c-format
+msgid "package %s is for a different operating system"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸ş¤±¤Ç¤¹"
 
-#: lib/problems.c:113
-#, c-format
-msgid "package %s-%s-%s is already installed"
+#: lib/problems.c:107
+#, fuzzy, c-format
+msgid "package %s is already installed"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
-msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)"
+msgid "path %s in package %s is not relocateable"
+msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó"
 
-#: lib/problems.c:123
-#, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+#: lib/problems.c:116
+#, fuzzy, c-format
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹"
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, fuzzy, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s "
 "¤«¤é¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Ş¤¹"
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) "
 "¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/problems.c:141
-#, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+#: lib/problems.c:131
+#, fuzzy, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s "
 "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ç)"
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, fuzzy, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s "
 "¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ç)"
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+#: lib/problems.c:153
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Ş¤·¤¿"
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "¥Õ¥©¡¼¥Ş¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr "Ä̾ï"
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr "ÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr "¥Í¥Ã¥È¶¦Í­"
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(̤ÃΤΠ%3d)"
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr "(²¿¤Î¾õÂ֤⤢¤ê¤Ş¤»¤ó)"
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ı¤Ã¤Æ¤¤¤Ş¤»¤ó"
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Ş¤»¤ó: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Ş¤»¤ó\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó(v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (¥­¡¼¤Îʶ¼º) "
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3430,7 +3400,7 @@ msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 msgid "error(%d) removing record %s from %s"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
@@ -3441,527 +3411,522 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Ş¤¹\n"
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Ş¤¹\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Ş¤¹\n"
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Ş¤¹\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Ş¤¹\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "°ì»şÅª¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Ş¤¹"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ÎºîÀ®¥¨¥é¡¼: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Ş¤»¤ó"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Ş¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ğ¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Ş¤¹"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¿ô¤¨¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr "¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤òõ¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹ - žÁ÷¼ºÇÔ - %s\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr "%s ¤È¤·¤Æ...\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹ - žÁ÷¼ºÇÔ - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼èÆÀ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹ş¤ß¥¨¥é¡¼ "
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ğ¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Ş¤·¤¿\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "°Í¸À­¤Î·çÇ¡:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "¥Ğ¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, fuzzy, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Ş¤¹:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "Æɤ߹ş¤ß¤Î¼ºÇÔ: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "2ÈÖÌܤΠ':' ¤¬¤¢¤ê¤Ş¤»¤ó(%s:%d ¤Ç)"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "%s:%d ¤Ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã̾¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "%s:%d ¤Ç¥Ç¡¼¥¿¹Ô¤¬ÉÔ´°Á´¤Ç¤¹"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "%s:%d ¤Ç¥Ç¡¼¥¿¹Ô¤Ë°ú¿ô¤¬Â¿¤¹¤®¤Ş¤¹"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "ÉÔÀµ¤Ê arch/os ÈÖ¹æ: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "%s:%d ¤ÇÉÔ´°Á´¤Ê¥Ç¥Õ¥©¥ë¥È¹Ô"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "%s:%d ¤Ç¥Ç¥Õ¥©¥ë¥È¹Ô¤Ï°ú¿ô¤¬Â¿¤¹¤®¤Ş¤¹"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr "¿­Ä¥¤Ç¤­¤Ş¤»¤ó %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Æɤ߹ş¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s¡£"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£"
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "%s:%d ¤Ç ':' ¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "%s ¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "%s ¤Î¿­Ä¥¼ºÇÔ %s:%d \"%s\""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó  %s:%d"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "%s ÍѤΥ¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "'%s' ¤ÎÉÔÀµ¤Ê¥ª¡¼¥×¥ó %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.com ¤ËÏ¢Íí¤ò²¼¤µ¤¤\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr "½ğ̾¥µ¥¤¥º     : %d\n"
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
-msgstr "¥Ø¥Ã¥À + ¥¢¡¼¥«¥¤¥Ö: %d\n"
-
-#: lib/signature.c:116
-#, c-format
-msgid "expected size   : %d\n"
-msgstr "´üÂÔ¤µ¤ì¤ë¥µ¥¤¥º: %d\n"
-
-#: lib/signature.c:120
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¤Ï°ìÈ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó -- ¥µ¥¤¥º¥Á¥§¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹\n"
 
-#: lib/signature.c:139
+#: lib/signature.c:119
+#, c-format
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
+msgstr ""
+
+#: lib/signature.c:123
+#, fuzzy, c-format
+msgid "  Actual size: %12d\n"
+msgstr "½ğ̾¥µ¥¤¥º: %d\n"
+
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr "½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr "¸Å¤¤ PGP ½ğ̾\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "¸Å¤¤(ÆâÉô¤À¤±¤Î)½ğ̾!  ¤É¤¦¤ä¤Ã¤Æ¤½¤ì¤ò¼ê¤Ë¤¤¤ì¤Ş¤·¤¿¤«!?"
 
-#: lib/signature.c:157
-msgid "New Header signature\n"
-msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr "½ğ̾¥µ¥¤¥º: %d\n"
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr "½ğ̾¥Ñ¥Ã¥É: %d\n"
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "pgp ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó(%s)"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp ¼ºÇÔ"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "pgp ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ½ğ̾¥µ¥¤¥º: %s\n"
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "½ğ̾¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "PGP ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 #, fuzzy
 msgid "Couldn't exec gpg"
 msgstr "gpg ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 #, fuzzy
 msgid "gpg failed"
 msgstr "gpg ¼ºÇÔ"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 #, fuzzy
 msgid "gpg failed to write signature"
 msgstr "gpg ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, fuzzy, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ½ğ̾¥µ¥¤¥º: %s\n"
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, fuzzy, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP ¤ò»ÈÍѤ·¤Æ½ğ̾¤ÎÀ¸À®Ãæ\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "GPG ¤ò»ÈÍѤ·¤Æ½ğ̾¤ÎÀ¸À®Ãæ\n"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 "pgp ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 "PGP ¥Á¥§¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤¹¤ë¤¿¤á¤Ë --nopgp ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr "¼Â¹Ô¼ºÇÔ!\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 "gpg ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿¡£\n"
 "GPG ¥Á¥§¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤¹¤ë¤¿¤á¤Ë --nogpg ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "pgp ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Ç̵¸ú¤Ê %%_signature ¥¹¥Ú¥Ã¥¯"
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Ş¤¹\n"
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "%s ¤òºï½ü¤Ç¤­¤Ş¤»¤ó - ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤¢¤ê¤Ş¤»¤ó"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "%s ¤Î rmdir ¤Ë¼ºÇÔ: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "%s ¤Îºï½ü¤Ë¼ºÇÔ: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr "¥Õ¥¡¥¤¥ë test = %d ¤òºï½ü¤·¤Ş¤¹\n"
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr "¥İ¥¹¥È¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
@@ -3993,226 +3958,235 @@ msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËş¤¿¤·¤Æ¤¤¤Ş¤»¤ó:"
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr "À®¸ù"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 #, fuzzy
 msgid "Bad server response"
 msgstr "¥µ¡¼¥Ğ¤«¤éÀµ¾ï¤Ê±şÅú¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 #, fuzzy
 msgid "Server IO error"
 msgstr "¥µ¡¼¥Ğ IO ¥¨¥é¡¼"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 #, fuzzy
 msgid "Server timeout"
 msgstr "¥µ¡¼¥Ğ¥¿¥¤¥à¥¢¥¦¥È"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "¥µ¡¼¥Ğ¤Î¥Û¥¹¥È¥¢¥É¥ì¥¹¤òÄ´¤Ù¤é¤ì¤Ş¤»¤ó"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "¥µ¡¼¥Ğ¤Î¥Û¥¹¥È̾¤òÄ´¤Ù¤é¤ì¤Ş¤»¤ó"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "¥µ¡¼¥Ğ¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "¥µ¡¼¥Ğ¤È¤Î¥Ç¡¼¥¿¥³¥Í¥¯¥·¥ç¥ó¤Î³ÎΩ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Î IO ¥¨¥é¡¼"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "¥ê¥â¡¼¥È¥µ¡¼¥Ğ¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥ÉÀßÄꥨ¥é¡¼"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "¥µ¡¼¥Ğ¾å¤Ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr "½èÍıÃæ¤Î¥¢¥Ü¡¼¥È"
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "ÉÔÌÀ¤â¤·¤¯¤Ïͽ´ü¤»¤Ì¥¨¥é¡¼"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "%s ¤Ø %s pw %s ¤È¤·¤Æ¥í¥°¥¤¥óÃæ\n"
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== ¥¢¥¯¥Æ¥£¥Ö %d ¥¨¥ó¥×¥Æ¥£ %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr "¥Ş¥¯¥í %%%s ¤Ï¥Ü¥Ç¥£¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr "¥Ş¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%define)"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr "¥Ş¥¯¥í %%%s ¤Ï opts ¤¬½ªÃ¼¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr "¥Ş¥¯¥í %%%s ¤Ï¶õ¤Î¥Ü¥Ç¥£¤Ç¤¹"
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr "¥Ş¥¯¥í %%%s ¤Ï¿­Ä¹¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr "¥Ş¥¯¥í %%%s ¤Ï°ãË¡¤Ê̾Á°¤Ç¤¹(%%undefine)"
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "¥Ş¥¯¥í %%%s (%s) ¤Ï¥ì¥Ù¥ë %d °Ê²¼¤Ç»ÈÍѤµ¤ì¤Ş¤»¤ó¤Ç¤·¤¿"
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, fuzzy, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c (%s(%s)Ãæ¤Ë)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "ºÆµ¢¤Î¿¼¤µ(%d)¤¬ºÇÂçÃÍ(%d)¤è¤ê¤âÂ礭¤¤"
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, fuzzy, c-format
 msgid "Unterminated %c: %s"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤ %c: %s"
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr "A %% ¤Ï¹½Ê¸²òÀϤǤ­¤Ê¤¤¥Ş¥¯¥í¤¬Â³¤¤¤Æ¤¤¤Ş¤¹"
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "¥Ş¥¯¥í %%%.*s ¤Ï¸«¤Ä¤«¤ê¤Ş¤»¤ó¡¢¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr "¥¿¡¼¥²¥Ã¥È¥Ğ¥Ã¥Õ¥¡¥ª¡¼¥Ğ¡¼¥Õ¥í¡¼"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "¥Õ¥¡¥¤¥ë %s: ¤Ï %d ¥Ğ¥¤¥È¤è¤ê¾®¤µ¤¤¤Ç¤¹"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "(¥¨¥é¡¼ 0x%x)"
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "Ã×̿Ū¤Ê¥¨¥é¡¼: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "¥¨¥é¡¼: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "·Ù¹ğ: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s ¤Î¥Ñ¥¹¥ï¡¼¥É:"
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "¥¨¥é¡¼: %s¥İ¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "url ¥İ¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#, fuzzy
-#~ msgid "undefined identifier"
-#~ msgstr "ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¼±ÊÌ»Ò"
+#~ msgid "sigsize         : %d\n"
+#~ msgstr "½ğ̾¥µ¥¤¥º     : %d\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s"
+#~ msgid "Header + Archive: %d\n"
+#~ msgstr "¥Ø¥Ã¥À + ¥¢¡¼¥«¥¤¥Ö: %d\n"
+
+#~ msgid "expected size   : %d\n"
+#~ msgstr "´üÂÔ¤µ¤ì¤ë¥µ¥¤¥º: %d\n"
+
+#~ msgid "New Header signature\n"
+#~ msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
+
+#, fuzzy
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)"
 
 #~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
 #~ msgstr "RPMERR_INTERNAL: getUname() ¤Î¸Â³¦¤Ë㤷¤Ş¤·¤¿\n"
@@ -4224,6 +4198,17 @@ msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 #~ msgstr "ÆâÉôŪ¤Ê¥¨¥é¡¼ (rpm ¤Î¥Ğ¥°?)"
 
 #, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "sigtarget ¤ÎÆɤ߹ş¤ß¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
+
+#, fuzzy
+#~ msgid "undefined identifier"
+#~ msgstr "ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¼±ÊÌ»Ò"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s"
+
+#, fuzzy
 #~ msgid "RPM database already exists"
 #~ msgstr "RPM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Ş¤¹"
 
diff --git a/po/ko.po b/po/ko.po
index 268c54c31..b6b43ac46 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index fd69be3f6..ac2763a42 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,1724 +1,1696 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
-"PO-Revision-Date: 2000-08-04 02:59+02:00\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"PO-Revision-Date: 2000-08-17 20:22+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "kan ikke åpne %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "kan ikke åpne pakkedatabase i %s\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "feil med avhengigheter under bygging:\n"
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Kunne ikke åpne tar rør: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Feil under lesing av spec fil fra %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Feil under endring av navn fra %s til %s: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Filen er ikke en vanlig fil: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Fil %s ser ikke ut til å være en spec fil.\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger målplattformene: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger for mål %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versjon %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright © 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 "Dette progeammet kan redistribueres fritt under betingelsene gitt i GNU GPL"
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr "Bruk: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <katalog>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <katalog>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <katalog>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <katalog>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <vert>] [--ftpport <port>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <vert>] [--httpport <port>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate oldpath=nysti]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <sti>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] fil1.rpm ... filN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <katalog>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <katalog>] [--prefix "
 "<katalog>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <vert>] [--httpport <port>] "
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate oldpath=nysti]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <sti>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        fil1.rpm ... filN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <katalog>] [mål]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <katalog>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [mål]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [mål]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [mål]"
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} fil1.rpm ... filN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <katalog>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] pakke1 ... pakkeN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           pakke1 ... pakkeN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "skriv ut denne meldingen"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "skriv ut hvilken versjon av rpm som brukes"
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr "   Alle modi støtter følgende argumenter:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<navn> <kropp>'"
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr "definér makro <navn> med verdi <kropp>"
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<navn>+'      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr "skriv ut utvidelsen av makro <navn> til stdout"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <kmd>          "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "send stdout til <kmd>"
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr "    --rcfile <fil>        "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "bruk <fil> i stedet for /etc/rpmrc og $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr "vis endelig rpmrc og makrokonfigurasjon"
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "gi litt mer informasjon"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "skriv ut mye informasjon (for feilsøking)"
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   Installér, oppgradér og spør (med -p) tillater bruk av URLer i stedet"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "   for filnavn i tillegg til følgende alternativer:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <vert>   "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "vertsnavn eller IP for ftp proxy"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <vert>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "portnummer for ftp tjener (eller proxy)"
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <vert>  "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr "vertsnavn eller IP for http proxy"
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr "portnummer for http tjener (eller proxy)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "spørringsmodus"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <katalog>  "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "bruk <katalog> som katalog for databasen"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <spfmt>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "bruk <spfmt> som headerformat (impliserer --info)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <katalog>    "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "bruk <katalog> som toppnivåkatalog"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Alternativer for pakkespesifikasjon:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "spør i alle pakker"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <fil>+         "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "spør pakke som eier <fil>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <pakkefil>+ "
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "spør (uinstallert) pakke <pakkefil>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pakke>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "spør pakker utløst av <pakke>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <cap>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
-msgstr ""
+msgstr "spør etter pakker som tilbyr <funk> funksjonalitet"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
-msgstr ""
+msgstr "        --whatrequires <funk>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
-msgstr ""
+msgstr "spør etter etter pakker som trenger <funk> funksjonalitet"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
-msgstr ""
+msgstr "      Alternativer for informasjonsvalg:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
-msgstr ""
+msgstr "vis pakkeinformasjon"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "vis pakkens endringslogg"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "vis pakkens filliste"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "vis filtilstander (impliserer -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "list kun dokumentasjonsfiler (impliserer -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "vis kun konfigurasjonfiler (impliserer -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
+"vis all verifiserbar informasjon for hver fil (må brukes med -l, -c, eller -d"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
-msgstr ""
+msgstr "list funksjoner pakken tilbyr"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "list pakkeavhengigheter"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "skriv ut de forskjellige [av]installasjonsskriptene"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr "vis utløserskriptene som finnes i pakken"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
+"verifisér en pakkeinstallasjon ved å bruke samme alternativer for "
+"pakkespesifikasjon som -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "ikke verifiser pakkeavhengigheter"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "ikke verifiser filens md5 sjekksum"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "ikke verifiser filattributter"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
-msgstr ""
+msgstr "list tags som kan brukes i et spørringsformat"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <pakkefil>"
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <pakkefil>         "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "installér pakke"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <sti>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr "hopp over filer i sti <sti>"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
-msgstr ""
+msgstr "      --relocate <gmlsti>=<nysti>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
-msgstr ""
+msgstr "omplassér filer fra <gmlsti> til <nysti>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
-msgstr ""
+msgstr "omplassér filer i ikke-omplasserbar pakke"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
-msgstr ""
+msgstr "      --prefix <kat>"
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
-msgstr ""
+msgstr "omplassér pakken til <kat>, hvis den er omplasserbar"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "ikke installer dokumentasjon"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
-msgstr ""
+msgstr "forkortning for --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
-msgstr ""
+msgstr "skriv ut skigarder etter som pakken installeres (nyttig med -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
-msgstr ""
+msgstr "installér alle filer, selv konfigurasjoner som ellers kan hoppes over"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "ikke verifiser pakkearkitektur"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "ikke sjekk diskplass før installasjon"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "ikke verifiser operativsystem for pakken"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "installér dokumentasjon"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "oppdatér databasen, men ikke modifiser filsystemet"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
-msgstr ""
+msgstr "ikke ordne pakkeinstallasjon for å tilfredsstille avhengigheter"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "ikke kjør noen installasjonsskript"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr "ikke kjør skript som utløses av denne pakken"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "skriv ut prosentvis fremgang etter som pakken installeres"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "installér selv om pakken erstatter installerte filer"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "reinstallér selv om pakken allerede er installert"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "ikke installér, men si ifra om det ville virke eller ikke"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
-msgstr ""
+msgstr "    --upgrade <pakkefil>"
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
-msgstr ""
+msgstr "    -U <pakkefil>"
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "oppgradér pakke (samme alternativ som --install, plus)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
+"oppgradér til en gammel versjon av pakken (--force ved oppgraderinger gjør "
+"dette automatisk)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
-msgstr ""
+msgstr "    --erase <pakke>"
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "slett (avinstallér) pakke"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
+"fjern alle pakker som er lik <pakke> (normalt vil en feil genereres hvis "
+"<pakke> spesifiserer flere pakker)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "ikke kjør noen pakkespesifikke skript"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
-msgstr ""
+msgstr "    -b<stadium> <spec>    "
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
-msgstr ""
+msgstr "    -t<stadium> <tarball> "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "bygg pakke, hvor <steg> er ett av:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (pakk ut kildekoden og legg til patcher)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "listesjekk (utfør noen kontroller på %filer)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompilér (prep og kompilér)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "installér (prep, kompilér, installér)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "binær pakke (prep, kompilér, installér, pakk)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src pakke (prep, kompilér, installér, pakk)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "hopp rett til spesifisert steg (kun for c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "fjern byggtréet når ferdig"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr "fjern kildekoden når ferdig"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr "fjern specfilen når ferdig"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr "generér PGP/GPG signatur"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
-msgstr ""
+msgstr "      --buildroot <kat>   "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "bruk <katalog> som byggrot"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
-msgstr ""
+msgstr "      --target=<plattform>+"
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
-msgstr ""
+msgstr "bygg pakkene for mål plattform1...plattformN."
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "ikke kjør noen steg"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
-msgstr ""
+msgstr "      --timecheck <sek>   "
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
-msgstr ""
+msgstr "sett tidssjekk til <sek> sekunder (0 slår av)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
-msgstr ""
+msgstr "    --rebuild <kilde_pakke>"
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
+"installér kildepakke, bygg binærpakke og fjern specfil, kilder, patcher og "
+"ikoner."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
-msgstr ""
+msgstr "    --recompile <kilde_pakke>"
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "som --rebuild, men ikke bygg noen pakke"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
-msgstr ""
+msgstr "    --resign <pakke>+     "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "signér en pakke (forkast nåværende signatur)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
-msgstr ""
+msgstr "    --addsign <pakke>+    "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "legg til signatur til en pakke"
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
-msgstr ""
+msgstr "    --checksig <pakke>+"
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr "    -K <pkg>+             "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "verifisér pakkesignatur"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "hopp over PGP-signaturer"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr "hopp over GPG-signaturer"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "hopp over MD5-signaturer"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "sjekk at en gyldig database eksisterer"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "bygg opp igjen databasen fra den eksisterende databasen"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
+"sett filrettigheter til de samme som i pakkedatabasen ved å bruke samme "
+"alternativer for pakkespesifikasjon som med -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
+"set fileierskap og gruppe til de som er i pakkedatabasen ved å bruke samme "
+"alternativer for pakkespesifikasjon som -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "kun ett større modi kan spesifiseres"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
-msgstr ""
+msgstr "-u og --uninstall er utgått og virker ikke lengre.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Bruk -e eller --erase i stedet.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "relokasjoner må begynne med en /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "relokasjoner må inneholde et ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "relokasjoner må ha et / etter ="
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr "eksluderingssti må begynne med en /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Intern feil i argumentprosesseringen (%d) :-(\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
-msgstr ""
+msgstr "én type spørring/verifisering kan utføres om gangen"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
-msgstr ""
+msgstr "uventede flagg for spørring"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
-msgstr ""
+msgstr "ventet spørringsformat"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
-msgstr ""
+msgstr "uventet spørringskilde"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
-msgstr ""
+msgstr "kun installasjon, oppgradering, rmsource og rmspec kan tvinges"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
-msgstr ""
+msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
-msgstr ""
+msgstr "kune en av --prefix eller --relocate kan brukes"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
+"--relocate og --excludepath kan kun brukes ved installasjon av nye pakker"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
-msgstr ""
+msgstr "--prefix kan kun brukes ved installasjon av nye pakker"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
-msgstr ""
+msgstr "argumenter til --prefix må begynne med en /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
-msgstr ""
+msgstr "--hash (-h) kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
-msgstr ""
+msgstr "--percent kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
-msgstr ""
+msgstr "--replacefiles kan kun spesifiseres under pakkeinstallasjon"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "    --define '<navn> <kropp>'"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "skriv ut utvidelsen av makro <navn> til stdout"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
-#, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
-msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <katalog>]"
-
-#: rpmqv.c:303
+#: rpmqv.c:301
 #, c-format
-msgid ""
-"       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
-msgstr ""
-
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <fil>] [--ignorearch] [--dbpath <katalog>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpmqv.c:323
-#, fuzzy, c-format
+#: rpmqv.c:305
+#, c-format
 msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+"       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
-"       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <fil>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+#: rpmqv.c:325
+#, c-format
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
-"                        [--scripts] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpmqv.c:337
-#, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+#: rpmqv.c:339
+#, c-format
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
-"       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <fil>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=plattform1[,plattform2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] specfil"
 
-#: rpmqv.c:350
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "                        [--rmsource] [--rmspec] specfil"
+#: rpmqv.c:352
+#, c-format
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
-#, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
-msgstr "       rpm {--resign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
+#: rpmqv.c:359
+#, c-format
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgstr ""
 
-#: rpmqv.c:358
-#, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
-msgstr "       rpm {--addsign} [--rcfile <fil>] pakke1 pakke2 ... pakkeN"
+#: rpmqv.c:360
+#, c-format
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgstr ""
 
-#: rpmqv.c:359
-#, fuzzy, c-format
+#: rpmqv.c:361
+#, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
-"       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
-#, fuzzy
-msgid "   --eval '<expr>+'       "
-msgstr "    --eval '<navn>+'      "
-
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "skriv ut utvidelsen av makro <navn> til stdout"
-
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-#, fuzzy
-msgid "   --macros <file:...>    "
-msgstr "    --rcfile <fil>        "
+msgid "   --pipe <cmd>           "
+msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr "     -f <fil>+            "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr "     -p <pakkefil>+       "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <pakke>"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr "spør/verifisér pakker utløst av <pakke>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "ikke kjør noen steg"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Bruk -e eller --erase i stedet.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1728,7 +1700,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1754,486 +1726,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
 #, c-format
-msgid "Could not open %s: %s\n"
+msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:418
 #, c-format
-msgid "Unable to write package: %s"
+msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:455
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr ""
-
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
-msgstr ""
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
 #: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
+msgstr "Feil under endring av navn fra %s til %s: %s\n"
+
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Kunne ikke åpne spec fil %s: %s\n"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Kunne ikke åpne spec fil %s: %s\n"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2248,182 +2235,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2452,57 +2439,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2518,125 +2505,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2651,546 +2624,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
+msgstr "pakke %s kan ikke relokeres\n"
+
 #: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:108
-#, c-format
-msgid "package %s-%s-%s is for a different operating system"
-msgstr ""
+#: lib/problems.c:107
+#, fuzzy, c-format
+msgid "package %s is already installed"
+msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/problems.c:113
-#, c-format
-msgid "package %s-%s-%s is already installed"
-msgstr ""
+#: lib/problems.c:111
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/problems.c:118
+#: lib/problems.c:116
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:121
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:126
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:131
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
 #: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
-msgstr ""
-
-#: lib/problems.c:151
-#, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3264,7 +3236,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3275,511 +3247,507 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
+#, fuzzy
 msgid "Preparing packages for installation..."
-msgstr ""
+msgstr "filer kan kun omplasseres under pakkeinstallasjon"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke åpne pakkedatabase i %s\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "feil under lesing fra fil %s\n"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "fil %s trenger en nyere versjon av RPM\n"
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "feilede avhengigheter:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "installerer binærpakker\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "kan ikke åpne %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke åpne %s: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "lesing feilet: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "mangler andre ':' ved %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "manglende navn på arkitektur ved %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Ukomplett datalinje ved %s:%d"
 
-#: lib/rpmrc.c:314
-#, fuzzy, c-format
+#: lib/rpmrc.c:317
+#, c-format
 msgid "Too many args in data line at %s:%d"
-msgstr "Ukomplett datalinje ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
-#, fuzzy, c-format
+#: lib/rpmrc.c:359
+#, c-format
 msgid "Incomplete default line at %s:%d"
-msgstr "Ukomplett datalinje ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "kan ikke åpne %s: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
-#, fuzzy, c-format
+#: lib/rpmrc.c:576
+#, c-format
 msgid "Unable to open %s for reading: %s."
-msgstr "Kunne ikke åpne spec fil %s: %s\n"
+msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
-#, fuzzy, c-format
+#: lib/rpmrc.c:621
+#, c-format
 msgid "Failed to read %s: %s."
-msgstr "kunne ikke opprette %s: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:655
-#, fuzzy, c-format
+#: lib/rpmrc.c:658
+#, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
-msgstr "mangler andre ':' ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
-#, fuzzy, c-format
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
+#, c-format
 msgid "missing argument for %s at %s:%d"
-msgstr "manglende navn på arkitektur ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
-#, fuzzy, c-format
+#: lib/rpmrc.c:701
+#, c-format
 msgid "cannot open %s at %s:%d: %s"
-msgstr "kan ikke åpne %s: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:738
-#, fuzzy, c-format
+#: lib/rpmrc.c:741
+#, c-format
 msgid "missing architecture for %s at %s:%d"
-msgstr "manglende navn på arkitektur ved %s:%d"
+msgstr ""
 
-#: lib/rpmrc.c:805
-#, fuzzy, c-format
+#: lib/rpmrc.c:808
+#, c-format
 msgid "bad option '%s' at %s:%d"
-msgstr "kunne ikke opprette %s: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3806,205 +3774,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr "Overflyt i målbuffer"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "Fil %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "Fil %s er mindre enn %d bytes"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "fatal feil: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "feil: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "advarsel: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "advarseo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Passord for %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "feil: %s-port må være et tall\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr "url-port må være et tall\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 983bee609..56695f4ca 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -16,673 +16,673 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "niespe³nione zale¿no¶ci:\n"
 
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nie mo¿na otworzyæ pliku spec: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Otwarcie potoku tara nie powiod³o siê: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Odczytanie pliku spec z %s nie powiod³o siê\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Zmiana nazwy %s na %s nie powiod³a siê\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "stat nie powiod³o siê %s: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Plik: %s nie jest regularnym plikiem\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s nie wygl±da na pakiet RPM\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Budowanie dla platform: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM wersja %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 #, fuzzy
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Program mo¿e byæ swobodnie rozpowszechniany na warunkach licencji GNU"
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "U¿ycie: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <katalog>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <katalog>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <katalog>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <port>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <host>] [--httpport <port>] "
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--noorder] [--relocate stara-¶cie¿ka=nowa-¶cie¿ka]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <¶cie¿ka>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] plik1.rpm ... plikN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <katalog>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <katalog>] [--prefix "
 "<katalog>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <host>] [--httpport <port>] "
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--noorder] [--relocate stara-¶cie¿ka=nowa-¶cie¿ka]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <¶cie¿ka>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        plik1.rpm ... plikN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [cele]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <katalog>] [cele]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <katalog>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [cele]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [cel]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [cel]"
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        plik1.rpm ... plikN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <katalog>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] pakiet1 ... pakietN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           pakiet1 ... pakietN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "u¿ycie:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "wy¶wietl ten tekst"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   wszystkie tryby pracy pozwalaj± u¿yæ nastêpuj±cych argumentów:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    --pipe <komenda>      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <komenda>      "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "przeka¿ standartowe wyj¶cie do <komenda>"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <plik>     "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "u¿yj <plik> zamiast /etc/rpmrc i $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "wy¶wietlaj nieco wiêcej komunikatów"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "wy¶wietlaj BARDZO du¿o komunikatów (dla odpluskwiania)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   instalacja, uaktualnianie i odpytywanie (z opcj± -p) pozwalaj± u¿yæ URL'a "
 "ftp zamiast"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "   nazwy pliku tak jak i nastêpuj±cych opcji:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <host>   "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "nazwa lub numer IP maszyny bêd±cej ftp proksy"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "numer portu serwera ftp (lub proksy)"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <host>   "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr "nazwa lub IP hosta bêd±cego http proksy"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>    "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr "numer portu serwera http (albo proksy)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "tryb odpytywania"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <katalog>      "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "u¿yj <katalog> jako katalogu bazy pakietów"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <format zapytania>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "u¿yj <format zapytania> jako formatu nag³ówka (dotyczy -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <katalog>        "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "u¿yj <katalogu> jako katalogu najwy¿szego poziomu"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Opcje selekcjonuj±ce pakiety:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "odpytuj wszystkie pakiety"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <plik>+        "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "zapytaj do jakiego pakietu nale¿y <plik>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <nazwa pakietu>+ "
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "odpytaj (niezainstalowany) pakiet <nazwa pakietu>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pakiet>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "odpytaj pakiety zahaczane przez <pakiet>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <zas>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr "odszukaj pakiety udostêpniaj±ce zasób <zas>"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <zas>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Opcje odpytuj±ce pakiety:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "wy¶wietl informacjê o pakiecie"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "wy¶wietl wykaz zmian dokonanych w pakiecie"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "wy¶wietl listê plików zawartych w pakiecie"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "poka¿ statusy plików (dotyczy -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "wy¶wietl tylko pliki dokumentacji (dotyczy -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "wy¶wietl tylko pliki konfiguracyjne (dotyczy -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 "poka¿ wszystkie informacje o ka¿dym pliku (musi byæ u¿yte z -l, -c lub -d)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "wypisz zasoby udostêpniane przez pakiet"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "wypisz zale¿no¶ci pakietu"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "wy¶wietl skrypty [de]instalacyjne"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr "wy¶wietl trigger skrypty zawarte w pakiecie"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "sprawd¼ stan pakietu (u¿ywa tych samych opcji co -q)"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "nie sprawdzaj zale¿no¶ci pakietu"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "nie sprawdzaj sum kontrolnych md5 plików"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "nie sprawdzaj atrybutów plików"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "wypisz etykiety w³asno¶ci, o które mo¿na zapytaæ"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <nazwa pakietu>"
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <nazwa pakietu>      "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "instaluj pakiet"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <¶cie¿ka>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "przesuñ pliki z drzewa <stara-¶cie¿ka> do drzewa <nowa-¶cie¿ka>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>      "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "przesuñ pliki pakietu do drzewa <katalog>, je¶li jest przesuwalny"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "nie instaluj dokumentacji"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skrócona wersja kombinacji --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "wy¶wietlaj znaki hash przy instalacji (fajne z -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaluj wszystkie pliki, nawet konfiguracyjne, które w innym przypadku by "
 "pominêto"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "nie sprawdzaj architektury systemu"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "nie sprawdzaj zajêto¶ci dysku przed instalacj±"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "nie sprawdzaj rodzaju systemu operacyjnego"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "zainstaluj dokumentacjê"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "od¶wie¿ bazê, ale nie modyfikuj systemu plików"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nie zmieniaj kolejno¶ci instalacji pakietów by zapewniæ zale¿no¶ci"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "wy¶wietlaj stan instalacji w procentach"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "instaluj nawet gdy pakiet zastêpuje inne zainstalowane pliki"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "przeinstaluj je¶li pakiet jest ju¿ zainstalowany"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "nie instaluj, podaj tylko czy instalacja zadzia³a czy nie"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <nazwa pakietu>"
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr "    -U <nazwa pakietu>      "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "uaktualnij pakiet (te same opcje jak --install, plus)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -690,15 +690,15 @@ msgstr ""
 "uaktualnij do starej wersji (--force robi to samo automatycznie podczas "
 "uaktualniania)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr "    --erase <pakiet>"
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "usuñ (odinstaluj) pakiet"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -706,102 +706,102 @@ msgstr ""
 "usuñ wszystkie pakiety, które spe³niaj± wzorzec <pakiet> (zazwyczaj "
 "wy¶wietlany jest b³±d gdy <pakiet> opisuje wiele pakietów)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<etap> <plik-spec>  "
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etap> <plik-tar>   "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "buduj pakiet, gdzie <etap> to:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "preparuj (rozpakuj ¼ród³a i na³ó¿ ³aty)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 "sprawdzanie z listy (wykonuje kilka podstawowych weryfikacji na %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompiluj (preparuj i kompiluj)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "instaluj (preparuj, kompiluj i instaluj)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "pakiet binarny/¼ród³owy (preparuj, kompiluj, instaluj, pakiet)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "przejd¼ od razu do podanego etapu (tylko dla c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "usuñ budowane drzewo po skoñczeniu"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr "usuñ ¼ród³a po zakoñczeniu"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "usuñ speca po zakoñczeniu"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr "generuj sygnaturê PGP/GPG"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <katalog>"
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "u¿yj <katalog> jako korzeñ budowanego drzewa"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "buduj pakiety dla platform docelowych platforma1...platformaN."
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "nie wykonuj ¿adnych etapów"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sekundy>"
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "ustaw sprawdzanie czasu do ilo¶ci <sekund> (0 wy³±cza)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <pkt_¼ród³> "
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -809,65 +809,65 @@ msgstr ""
 "instaluj pakiet ¼ród³owy, buduj pakiet binarny i usuñ plik spec, ¼ród³a, "
 "³aty i ikony"
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <pkt_¼ród³>"
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "jak --rebuild, ale nie buduj ¿adnych pakietów"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pakiet>+    "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pakiet>+   "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "dodaj sygnaturê do pakietu"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pakiet>+  "
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    --resign <pakiet>+    "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "sprawd¼ sygnaturê pakietu"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "pomiñ wszelkie sygnatury PGP"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr "pomiñ wszelkie sygnatury GPG"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "pomiñ wszelkie sygnatury MD5"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "upewnij siê, ¿e poprawna baza istnieje"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "przebuduj istniej±c± bazê"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -875,7 +875,7 @@ msgstr ""
 "ustaw prawa dostêpu takie jak zapisano w bazie pakietów (u¿ywa tych samych "
 "opcji co -q)"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -883,146 +883,146 @@ msgstr ""
 "ustaw w³a¶ciciela i grupê takie jak zapisano w bazie pakietów (u¿ywa tych "
 "samych opcji co -q)"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "tylko jeden g³ówny tryb pracy mo¿e byæ podany"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u i --uninstall nie s± ju¿ obs³ugiwane i nie pracuj±.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "U¿yj -e lub --erase\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "drzewa przesuniêæ musz± zaczynaæ sie od /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "specyfikacja przesuniêcia musi zawieraæ ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "specyfikacja przesuniêcia musi zawieraæ / po ="
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr "¶cie¿ki wy³±czeñ musz± siê zaczynaæ od /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "B³±d wewnêtrzny w przetwarzaniu argumentu (%d) :-(\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "tylko jeden typ odpytywania/sprawdzania mo¿na wykonaæ na raz"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr "b³êdna konstrukcja argumentów odpytywania"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr "b³êdna konstrukcja argumentów odpytywania"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "b³êdna konstrukcja argumentów odpytywania"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "tylko instalacjê, uaktualnienie i usuwanie ¼róde³ mo¿na wymusiæ"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "przesuwania plików mo¿na dokonaæ tylko w trakcie instalacji"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "nie mo¿na jednocze¶nie u¿yæ --prefix i --relocate"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate i --excludepath mo¿na u¿yæ tylko w trakcie instalacji nowych "
 "pakietów"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mo¿na u¿yæ tylko w trakcie instalacji nowych pakietów"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty dla --prefix musz± siê rozpoczynaæ od /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "nie mo¿na jednocze¶nie u¿yæ --excludedocs i --includedocs"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mo¿na u¿yæ tylko w trakcie usuwania pakietów"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mo¿na u¿yæ tylko w trakcie instalacji pakietów"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1030,7 +1030,7 @@ msgstr ""
 "--noscripts mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub sprawdzania "
 "pakietów"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1038,7 +1038,7 @@ msgstr ""
 "--notriggers mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub sprawdzania "
 "pakietów"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1047,14 +1047,14 @@ msgstr ""
 "--nodeps mo¿na u¿yæ tylko w trakcie budowania, instalacji, usuwania lub "
 "sprawdzania pakietów"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test mo¿na u¿yæ tylko w trakcie instalacji, usuwania lub budowania pakietów"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1062,315 +1062,278 @@ msgstr ""
 "--root (-r) mo¿na u¿yæ tylko w trakcie instalacji, usuwania, sprawdzania "
 "pakietów lub przebudowywania bazy"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty dla --root (-r) musz± siê rozpoczynaæ od /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage mo¿na u¿yæ tylko podczas aktualizacji"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp mo¿na u¿yæ tylko w trakcie sprawdzania sygnatury"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg mo¿na u¿yæ tylko podczas sprawdzania sygnatury"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nomd5 mo¿na u¿yæ tylko podczas sprawdzania sygnatury i weryfkiacji pakietu"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "brak dostêpu do pliku %s\n"
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr "nie znaleziono pgp: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr "Podaj has³o: "
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Weryfikacja has³a nieudana\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Has³o jest prawid³owe.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "B³êdny %%_signature spec w pliku makra.\n"
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr "wykonanie nie powiod³o siê\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "nieoczekiwane argumenty dla --querytags "
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "nie podano nazwy pakietu do sprawdzenia sygnatury"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "nie podano nazwy pakietu do podpisania"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "nie podano nazw plików do usuniêcia"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "zbyt wiele argumentów dla odpytywania wszystkich pakietów"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "nie podano argumentów dla trybu zapytañ"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr "zbyt wiele argumentów dla weryfikacji wszystkich pakietów"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "nie podano argumentów dla sprawdzania"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr "argument nie jest pakietem RPM\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr "b³±d odczytu nag³ówka z pakietu\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nie mo¿na otworzyæ pliku %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "U¿ycie: rpm {--help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <katalog>]"
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <plik>] [--dbpath <katalog>]"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <plik>] [--ignorearch] [--dbpath <katalog>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <plik>]"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e} [--root <katalog>] [--noscripts] [--rcfile <plik>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"                        [--scripts] [--root <katalog>] [--rcfile <plik>]"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <katalog>] [--rcfile <plik>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [cel]"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [cel]"
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile <plik>]"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=platforma1[,platforma2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] plik_spec"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <plik>] [-v] plik_spec"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... ¼ród³owyN.rpm"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <plik>] [-v] ¼ród³owy1.rpm ... "
 "¼ród³owyN.rpm"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "                        plik1.rpm ... plikN.rpm"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <plik>] pakiet1 pakiet2 ... pakietN"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <plik>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   wszystkie tryby pracy pozwalaj± u¿yæ nastêpuj±cych argumentów:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    --pipe <komenda>      "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "wy¶wietl wersjê u¿ywanego rpm-a"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <komenda>      "
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "      --rcfile <plik>     "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "      --dbpath <katalog>      "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "      --root <katalog>        "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1378,468 +1341,468 @@ msgstr ""
 "   instalacja, uaktualnianie i odpytywanie (z opcj± -p) pozwalaj± u¿yæ URL'a "
 "ftp zamiast"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   nazwy pliku tak jak i nastêpuj±cych opcji:"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "      --ftpproxy <host>   "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <port>    "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "      --httpproxy <host>   "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "      --httpport <port>    "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Opcje selekcjonuj±ce pakiety:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "odpytuj wszystkie pakiety"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "        -f <plik>+        "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "zapytaj do jakiego pakietu nale¿y <plik>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "        -p <nazwa pakietu>+ "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "odpytaj (niezainstalowany) pakiet <nazwa pakietu>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <pakiet>"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "odpytaj pakiety zahaczane przez <pakiet>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --whatprovides <zas>"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "odszukaj pakiety udostêpniaj±ce zasób <zas>"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --whatrequires <zas>"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "odszukaj pakiety wymagaj±ce zasobu <zas>"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 #, fuzzy
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <format zapytania>"
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Opcje odpytuj±ce pakiety:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "wypisz zasoby udostêpniane przez pakiet"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "wypisz zasoby udostêpniane przez pakiet"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "wy¶wietl skrypty [de]instalacyjne"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr "wy¶wietl trigger skrypty zawarte w pakiecie"
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "nie wykonuj ¿adnych etapów"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "    --install <nazwa pakietu>"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <nazwa pakietu>      "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <¶cie¿ka>"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "pomiñ pliki le¿±ce w <¶cie¿ce>"
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "nie wykonuj ¿adnych skryptów instalacyjnych"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "odpytywanie pakietów zahaczanych przez pakiet"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <katalog>      "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stara-¶cie¿ka>=<nowa-¶cie¿ka>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <nazwa pakietu>"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -U <nazwa pakietu>      "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "    --erase <pakiet>"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<etap> <plik-spec>  "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -t<etap> <plik-tar>   "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
 msgstr "pakiet nie ma nazwy"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "      --buildroot <katalog>"
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "      --target=<platforma>+"
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    --rebuild <pkt_¼ród³> "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    --recompile <pkt_¼ród³>"
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --resign <pakiet>+    "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --addsign <pakiet>+   "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <pakiet>+  "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    --resign <pakiet>+    "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "przebuduj istniej±c± bazê"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "U¿yj -e lub --erase\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath podano dla operacji nie u¿ywaj±cej bazy"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb mo¿na u¿yæ tylko w trakcie instalacji lub usuwania pakietów"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakietów do przebudowania"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "nie podano nazw plików spec do budowania"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nie mo¿na otworzyæ pliku tymczasowego"
 
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Wykonywanie: %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "Wykonanie %s nie powiod³o siê (%s)"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr "B³êdny status wyj¶cia z %s (%s)"
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 #, fuzzy
 msgid "syntax error while parsing =="
 msgstr "b³±d sk³adni w wyra¿eniu"
 
-#: build/expression.c:237
+#: build/expression.c:238
 #, fuzzy
 msgid "syntax error while parsing &&"
 msgstr "b³±d sk³adni w wyra¿eniu"
 
-#: build/expression.c:246
+#: build/expression.c:247
 #, fuzzy
 msgid "syntax error while parsing ||"
 msgstr "b³±d sk³adni w wyra¿eniu"
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr "b³±d interpretacji wyra¿enia"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr "niesparowane ("
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr "- tylko na liczbach"
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr "! tylko na liczbach"
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr "typy musz± siê zgadzaæ"
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr "* / nie jest wspierane dla ³añcuchów znakowych"
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr "- nie jest wspierane dla ³añcuchów znakowych"
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr "&& i || nie jest wspierane dla ³añcuchów znakowych"
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr "b³±d sk³adni w wyra¿eniu"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK nie powiod³o siê: %s\n"
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr "Brak '(' w %s %s"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "Brak ')' w %s(%s"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr "B³êdny znak %s: %s"
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr "Brak bia³ego znaku po %s(): %s"
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "B³êdna sk³adnia: %s(%s)"
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "B³êdne okre¶lenie trybu: %s(%s)"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr "B³êdne okre¶lenie dirmode: %s(%s)"
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr "Niespotykana d³ugo¶æ okre¶lenia lokalizacji \"%.*s\" w %%lang(%s)"
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr "Powtórzone okre¶lenie lokalizacji %.*s w %%lang(%s)"
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr "Limit trafieñ dla %%docdir"
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr "Tylko jeden argument dla %%docdir"
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr "Dwa pliki w jedenj linii: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "Plik musi siê zaczynaæ od \"/\": %s"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr "Nie mo¿na mieszaæ specjalnej %%doc z innymi formami: %s"
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr "Plik podany dwukrotnie: %s"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Plik nie zgadza siê z prefiksem (%s): %s"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "B³êdny u¿ytkownik/grupa: %s\n"
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Plik %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Plik musi siê zaczynaæ od \"/\": %s"
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Nie mo¿na otworzyæ %%files pliku: %s"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "linia: %s"
@@ -1849,7 +1812,7 @@ msgstr "linia: %s"
 msgid "Bad file: %s: %s"
 msgstr "plik %s: %s\n"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "B³êdny u¿ytkownik/grupa: %s"
@@ -1875,487 +1838,502 @@ msgstr "%s nie powiod³o siê"
 msgid "failed to write all data to %s"
 msgstr "zapisanie wszystkich danych do %s nie powiod³o siê"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Wyszukiwanie wymaganych zasobów...\n"
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Wyszukiwanie nie powiod³o siê"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plików: %s\n"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n"
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr "zapis w trybie cpio_copy nie powiód³ siê: %s"
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "odczyt w trybie cpio_copy nie powiód³ siê: %s"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "Nie mo¿na otworzyæ pliku PreIn: %s"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "Nie mo¿na otworzyæ pliku PreUn: %s"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "Nie mo¿na otworzyæ pliku PostIn: %s"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "Nie mo¿na otworzyæ pliku PostUn: %s"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr "Nie mo¿na otworzyæ pliku VerifyScript: %s"
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr "Nie mo¿na otworzyæ skryptu Trigger: %s"
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otwieranie %s: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: czytanie %s: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie jest pakietem RPM\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: czytanie nag³ówka z %s\n"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr "B³êdne dane CSA"
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr "Generowanie sygnatury: %d\n"
+
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %s\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:445
-#, c-format
-msgid "Generating signature: %d\n"
-msgstr "Generowanie sygnatury: %d\n"
-
-#: build/pack.c:458
+#: build/pack.c:470
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nie mo¿na odczytaæ sigtarget: %s"
 
-#: build/pack.c:465
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr "Nie mo¿na odczytaæ sigtarget: %s"
+msgid "Unable to read header from %s: %s"
+msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:471
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:494
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Nie mo¿na odczytaæ ikony: %s"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Nie mo¿na zapisaæ pakietu: %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n"
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr "linia %d: druga %s"
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr "wpisy %%changelog musz± zaczynaæ siê od *"
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr "niekompletny wpis %%changelog"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr "b³êdna data w %%changelog: %s"
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr "wpisy w %%changelog u³o¿one niechronologicznie"
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr "brak nazwiska w %%changelog"
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr "brak opisu w %%changelog"
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr "linia %d: b³±d w interpretacji wpisu %%description: %s"
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "linia %d: B³edna opcja %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr "linia %d: Zbyt du¿o nazw: %s"
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "linia %d: Pakiet nie istnieje: %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr "linia %d: Drugi opis"
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr "linia %d: B³±d w interpretacji wpisu %%files: %s"
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr "linia %d: Druga lista %%files"
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr "Architektura nie jest wspierana: %s"
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr "Architektura nie jest wspierana: %s"
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr "Ten OS nie jest wspierany: %s"
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr "Ten OS nie jest wspierany: %s"
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr "pole %s musi byæ obecne w pakiecie: %s"
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr "Podwójne wpisy %s w pakiecie: %s"
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr "Nieznany typ ikony: %s"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr "linia %d: Niepoprawna forma etykiety: %s"
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr "linia %d: Pusta etykieta: %s"
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "linia %d: Nielegalny znak '-' w %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "linia %d: wpis BuildRoot nie mo¿e byæ \"/\": %s"
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr "linia %d: Prefiksy nie mog± siê koñczyæ na \"/\": %s"
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "linia %d: wpis Docdir musi siê zaczynaæ od '/': %s"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "linia %d: pole Epoch/Serial musi byæ liczb±: %s"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "linia %d: B³êdny numer %s: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "linia %d: B³êdny format wpisu BuildArchitecture: %s"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr "B³±d wewnêtrzny: Fa³szywa etykieta %d"
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr "B³êdna specyfikacja pakietu: $s"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr "Pakiet ju¿ istnieje: %s"
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr "linia %d: Nieznana etykieta: %s"
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr "W pliku spec nie mo¿na u¿ywaæ wpisów BuildRoot"
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr "B³êdne ¼ród³o: %s: %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr "Brak ³aty numer %d"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr "Brak ¼ród³a numer %d"
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr "B³±d przetwarzania %%setup: %s"
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "linia %d: B³êdny argument dla %%setup %c: %s"
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "linia %d: B³êdna opcja %%setup %s: %s"
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "linia %d: Wymagany argument dla %%patch -b: %s"
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "linia %d: Wymagany argument dla %%patch -z: %s"
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "linia %d: Wymagany argument dla %%patch -p: %s"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "linia %d: B³êdny argument dla %%patch -p: %s"
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr "Zbyt wiele ³at!"
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "linia %d: B³êdny argument dla %%patch: %s"
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr "linia %d: druga sekcja %%prep"
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 "linia %d: Znaki musz± sie zaczynaæ od alfanumerycznych, '_' lub '/': %s"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "linia %d: Nazwa pliku niedozwolona: %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "linia %d: Wersja w nazwach plików niedozwolona: %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr "linia %d: Wymagana wersja: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr "linia %d: triggery musz± mieæ --: %s"
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr "linia %d: B³±d przetwarzania %s: %s"
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr "linia %d: skrypt (tu jako program) musi siê zaczynaæ od '/': %s"
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr "linia %d: Drugi %s"
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr "linia %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr "Niedomkniête %%if"
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: Napotkano %%else bez if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: Napotkano %%endif bez if"
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr "b³ednie sformatowany wpis %%include"
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr "Nie mo¿na budowaæ na takie architektury"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr "Pakiet nie ma %%description: %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr "archiwum = %s fs = %s\n"
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr "linia %d: B³êdny numer: %s"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr "linia %d: b³êdny numer no%s: %d"
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "linia %d: B³êdny numer %s: %s\n"
@@ -2370,182 +2348,182 @@ msgstr "nie mo¿na zmieniæ nazwy %s na %s: %s\n"
 msgid "can't unlink %s: %s\n"
 msgstr "nie mo¿na odwi±zaæ %s: %s\n"
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(b³±d 0x%x)"
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr "B³êdny magic"
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr "B³êdny/nieczytelny nag³ówek"
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr "Rozmiar nag³ówka jest zbyt du¿y"
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr "Nieznany typ pliku"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr "Brak twardego dowi±zania"
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr "B³±d wewnêtrzny"
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr " nie powiod³o siê -"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "b³êdny status pliku: %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2574,57 +2552,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, fuzzy, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, fuzzy, c-format
 msgid "removed db environment %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, fuzzy, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
@@ -2640,125 +2618,112 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(nie jest liczb±)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr "stat nie powiod³o siê %s: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr "plik %s jest na nieznanym urz±dzeniu"
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
+#, fuzzy
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n"
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obs³ugiwany\n"
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "B³edny licznik dla headerAddEntry(): %d\n"
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "brak { po %"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "brak } po %{"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "pusty format etykiety"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "pusta nazwa etykiety"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "nieznana etykieta"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "spodziewany ] na koñcu tablicy"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "nie spodziewany ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "nie spodziewany }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "spodziewany ? w wyra¿eniu"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr "spodziewany { po ? w wyra¿eniu"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "spodziewany } w wyra¿eniu"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr "spodziewany : po podwyra¿eniu ?"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr "spodziewany { po : w wyra¿eniu"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "spodziewany | na koñcu wyra¿enia"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(nieznany typ)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   plik: %s akcja: %s\n"
@@ -2773,569 +2738,568 @@ msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root"
 msgid "group %s does not exist - using root"
 msgstr "grupa %s nie istnieje - u¿yto grupy root"
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "warto¶æ %%instchangelog w pliku makra powinna byæ liczb±, a nie jest"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr "instacja pakietu ¼ród³owego\n"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie mo¿na zapisaæ do %s"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr "¼ród³a w: %s\n"
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "plik spec w: %s\n"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "zmiana nazwy z %s na %s nie powiod³a sie: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr "przebieg testowy - instalacja zatrzymana\n"
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr "uruchamianie skryptu preinstall (je¶li istnieje)\n"
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "ostrze¿enie: %s utworzony jako %s"
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "ostrze¿enie: %s zapisany jako %s"
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "b³±d w tworzeniu pliku tymczasowego %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr "buildroot by³ ju¿ wcze¶niej podany"
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
 msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr "pakiet binarny (preparuj, kompiluj, instaluj, pakiet)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "instacja pakietu ¼ród³owego\n"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr "wymu¶ build root"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr "nie wykonuj ¿adnych etapów budowania"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "nie akceptuj wpisów I18N ze speca"
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr "usuñ speca po zakoñczeniu"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr "wymu¶ platformê docelow±"
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr "wyszukaj wpisy I18N w katalogu speca"
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "zapytaj do jakiego pakietu nale¿y <plik>"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "odpytywanie pakietów w grupie"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "odpytywanie pakietu"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "tryb odpytywania"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr "odpytywanie pliku spec"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr "odpytywanie pakietów zahaczanych przez pakiet"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "tryb odpytywania"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "tryb odpytywania"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr "odpytywanie pakietów wymagaj±cych zasobu"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr "odpytywanie pakietów udostêpniaj±cych zasób"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr "wy¶wietl wszystkie pliki konfiguracyjne"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr "wy¶wietl wszystkie pliki dokumentacji"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr "podaj postawowe informacje o pliku"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr "wy¶wietl pliki zawarte w pakiecie"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr "u¿yj nastêpuj±cego formatu zapytania"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr "wy¶wietl status pokazywanych plików"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr "wy¶wietl wiêcej informacji o plikach z listy"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " jest wymagany przez %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " jest w konflikcie z %s-%s-%s\n"
 
-#: lib/problems.c:103
-#, c-format
-msgid "package %s-%s-%s is for a different architecture"
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
 msgstr "pakiet %s-%s-%s zbudowano dla innej architektury"
 
-#: lib/problems.c:108
-#, c-format
-msgid "package %s-%s-%s is for a different operating system"
+#: lib/problems.c:103
+#, fuzzy, c-format
+msgid "package %s is for a different operating system"
 msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego"
 
-#: lib/problems.c:113
-#, c-format
-msgid "package %s-%s-%s is already installed"
+#: lib/problems.c:107
+#, fuzzy, c-format
+msgid "package %s is already installed"
 msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
 
-#: lib/problems.c:118
-#, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
-msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s"
+#: lib/problems.c:111
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
-#, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+#: lib/problems.c:121
+#, fuzzy, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s"
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, fuzzy, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, fuzzy, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+#: lib/problems.c:153
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s"
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "b³±d w formacie: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(nie zawiera plików)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr "normalny      "
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr "zast±piony    "
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr "niezainstalowany"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr "udostêpniony w sieci"
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(nieznany %3d)"
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr "(brak statusu)"
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id"
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "nie mo¿na odwi±zaæ %s: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod³o siê\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s nie wygl±da na pakiet RPM\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "odpytywanie %s nie powiod³o siê\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "odpytywanie pliku spec %s nie powiod³o siê, nie mo¿na interpretowaæ\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s nie zawiera ¿adnych pakietów\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¿aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¿aden pakiet nie wymaga %s\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¿aden pakiet nie udostêpnia %s\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "b³êdny numer pakietu: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %d\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "nie mo¿na odczytaæ rekordu %d\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Open nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "wykonanie nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Nie mo¿na ponownie podpisaæ v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Sygnatura nie jest dostêpna\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Sygnatura nie jest dostêpna (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr "OK"
 
@@ -3409,7 +3373,7 @@ msgstr "b³±d zapisywania rekordu %s do %s"
 msgid "error(%d) removing record %s from %s"
 msgstr "b³±d usuwania rekordu %s z %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
@@ -3422,515 +3386,510 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "b³±d szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "b³±d szukania pakietu %s\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywujê bazê danych w rootdir %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tymczasowa baza danych %s ju¿ istnieje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "b³±d przy tworzeniu katalogu %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr "zliczanie pakietów do zainstalowania\n"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr "szukanie pakietów do ¶ci±gniêcia\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "¦ci±ganie %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr "... jako %s\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "¶ci±gniêto %d pakietów\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie mo¿na otworzyæ pliku %s: %s"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie mo¿e byæ zainstalowany\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "b³±d czytania z pliku %s\n"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "plik %s wymaga nowszej wersji RPM\n"
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "niespe³nione zale¿no¶ci:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "instalacja pakietów binarnych\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" okre¶la wiele pakietów\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "odczyt nie powiód³ siê: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "brak drugiego ':' przy %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "brak nazwy architektury przy %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Niekompletna linia danych przy %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Zbyt wiele argumentów w linii danych przy %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "B³êdny numer arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Niekompletna domy¶lna linia przy %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Zbyt wiele argumentów w linii domy¶lnej przy %s:%d"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Nie mo¿na rozszerzyæ %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Odczytanie %s nie powiod³o siê: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "brak ':' przy %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "brak argumentu dla %s przy %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
-#, fuzzy, c-format
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
+#, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
-msgstr "%s: Open nie powiod³o siê\n"
+msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "nie mo¿na otworzyæ %s przy %s:%d"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "brak architektury dla %s przy %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "b³êdna opcja '%s' przy %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Nieznany system: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Skontaktuj siê, proszê, z rpm-list@redhat.com\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr "rozmiar sygnat. : %d\n"
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
-msgstr "Nag³ówek + Archiwum: %d\n"
+msgid "file is not regular -- skipping size check\n"
+msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n"
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
-msgstr "oczekiwany rozmiar: %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
+msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
-msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n"
+#: lib/signature.c:123
+#, fuzzy, c-format
+msgid "  Actual size: %12d\n"
+msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr "Stara sygnatura PGP\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Stara (tylko wewnêtrzna) sygnatura! Sk±d Ty to wzi±³e¶!?"
 
-#: lib/signature.c:157
-msgid "New Header signature\n"
-msgstr "Nowa sygnatura nag³ówka\n"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr "Blok sygnatury: %d\n"
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "Nie mo¿na uruchomiæ pgp"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp nie powiod³o siê"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "zapisanie sygnatury przez pgp nie powiod³o siê"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "rozmiar sygnatury PGP: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "nie mo¿na odczytaæ sygnatury"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Mam %d bajtów sygnatury PGP\n"
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr "Nie mo¿na uruchomiæ gpg"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr "gpg nie powiod³o siê"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr "zapisanie sygnatury przez gpg nie powiod³o siê"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "rozmiar sygnatury GPG: %d\n"
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Mam %d bajtów sygnatury GPG\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "Nie mo¿na uruchomiæ pgp. U¿yj --nopgp aby pomin±æ sprawdz. PGP"
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr "uruchomienie nie powiod³o siê!\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "Nie mo¿na uruchomiæ gpg. U¿yj --nopgp aby pomin±æ sprawdz. GPG"
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "Nie mo¿na uruchomiæ pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr "B³êdny wpis %%_signature w pliku makra"
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "wy³±czanie %s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominiêty z powodu flagi missingok\n"
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "nie mo¿na usun±æ %s - katalog nie jest pusty"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "skasowanie katalogu %s nie powiod³o siê"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "skasowanie %s nie powiod³o siê: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr "usunie pliki test = %d\n"
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr "uruchamianie skryptu postinstalacyjnego (je¦li istnieje)\n"
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "wykonanie skryptu nie powiod³o siê"
@@ -3961,216 +3920,224 @@ msgstr "brak    %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr "Sukces"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr "B³êdna odpowied¼ serwera"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr "B³±d WE/WY(IO) serwera"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr "Przekroczony limit czasu serwera"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr "Nie mo¿na znale¼æ adresu serwera"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr "Nie mo¿na znale¼æ nazwy serwera"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr "Po³±czenie z serwerem nie powiod³o siê"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "B³±d WE/WY(IO) na lokalnym pliku"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "B³±d: ustawienie zdalnego serwera w tryb pasywny nie powiod³o siê"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Plik nie zosta³ znaleziony na serwerze"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr "Przerywanie ..."
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr "Nieznany lub nieoczekiwany b³±d"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "logowanie do %s jako %s, has³o %s\n"
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktywny %d pusty %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(pusty)"
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(pusty)\n"
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr "Makro %%%s ma niezakoñczon± strukturê"
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr "Makro %%%s ma niedozwolon± nazwê (%%define)"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr "Makro %%%s ma niezakoñczone opcje"
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr "Makro %%%s nie zawiera ¿adnych poleceñ"
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr "Rozwiniêcie makra %%%s nie powiod³o siê"
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr "Makro %%%s ma niedozwolon± nazwê (%%undefine)"
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) nie by³o u¿yte poni¿ej poziomu %d"
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Nieznana opcja %c in %s(%s)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "G³êboko¶æ(%d) rekursji wiêksza mi¿ maks(%d)"
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Niezakoñczone %c: %s"
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr "Napotkano nieprzetwarzalne makro po %%"
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Nie znaleziono makra %%%.*s, makro pominiête"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr "Przepe³nienie bufora docelowego"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "Plik %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "Plik %s jest mniejszy ni¿ %d bajtów"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "(b³±d 0x%x)"
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "fatalny b³±d: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "b³±d: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "ostrze¿enie: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Has³o dla %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "b³±d: %sport musi byæ liczb±\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr "port musi byæ liczb±\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
 
-#~ msgid "undefined identifier"
-#~ msgstr "nieznany identyfikator"
+#~ msgid "sigsize         : %d\n"
+#~ msgstr "rozmiar sygnat. : %d\n"
 
-#, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "      --rcfile <plik>     "
+#~ msgid "Header + Archive: %d\n"
+#~ msgstr "Nag³ówek + Archiwum: %d\n"
+
+#~ msgid "expected size   : %d\n"
+#~ msgstr "oczekiwany rozmiar: %d\n"
+
+#~ msgid "New Header signature\n"
+#~ msgstr "Nowa sygnatura nag³ówka\n"
+
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s"
 
 #~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
 #~ msgstr "RPMERR_INTERNAL: Limit trafieñ w getUname()\n"
@@ -4181,6 +4148,13 @@ msgstr "utworzenie %s nie powiod³o siê\n"
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "b³±d wewnêtrzny (b³±d w rpm'ie?): "
 
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Nie mo¿na odczytaæ sigtarget: %s"
+
+#~ msgid "undefined identifier"
+#~ msgstr "nieznany identyfikator"
+
 #~ msgid ""
 #~ "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 #~ msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 544ee38e8..81fc602c6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 2000-08-01 21:11+01:00\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt <morais@poli.org>\n"
@@ -9,1680 +9,1650 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 "não consegui abrir %s/packages.rpm\n"
 "\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "não consigo abrir ficheiro spec %s: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "não consigo abrir ficheiro spec %s: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "não consigo abrir ficheiro spec %s: %s\n"
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1692,7 +1662,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1718,486 +1688,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
 #, c-format
-msgid "Could not open %s: %s\n"
+msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:418
 #, c-format
-msgid "Unable to write package: %s"
+msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:455
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr ""
-
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
-msgstr ""
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "não consigo abrir ficheiro spec %s: %s\n"
 
 #: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
+msgstr "não consigo abrir ficheiro spec %s: %s\n"
+
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "não consigo abrir ficheiro spec %s: %s\n"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "não consigo abrir ficheiro spec %s: %s\n"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2212,182 +2197,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2416,57 +2401,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2482,125 +2467,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2615,546 +2586,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3230,7 +3200,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3241,515 +3211,508 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+"não consegui abrir %s/packages.rpm\n"
+"\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
 msgstr ""
-"não consegui abrir %s/packages.rpm\n"
-"\n"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
-#, fuzzy, c-format
+#: lib/rpmrc.c:576
+#, c-format
 msgid "Unable to open %s for reading: %s."
-msgstr "não consigo abrir ficheiro spec %s: %s\n"
+msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
-#, fuzzy, c-format
+#: lib/rpmrc.c:621
+#, c-format
 msgid "Failed to read %s: %s."
-msgstr "não consigo abrir ficheiro spec %s: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
-#, fuzzy, c-format
+#: lib/rpmrc.c:701
+#, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
-"não consegui abrir %s/packages.rpm\n"
-"\n"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3776,205 +3739,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index da5ba6b8d..ce809fc7f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,71 +2,72 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-11-07 07:55-0500\n"
+msgstr "POT-Creation-Date: 2000-12-12 13:07-0500\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr ""
+# , c-format
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "Não consegui abrir: %s\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "lista dependências do pacote"
 
 # , c-format
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "Não consegui abrir: %s\n"
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "instale pacote"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
@@ -79,472 +80,472 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM versão %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 "Este Software pode ser livremente redistribuido sob os termos da Licensa "
 "Pública GNU (GPL)"
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "uso: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <diretório>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <diretório>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <arquivo>] [--ignorearch] [--dbpath "
 "<diretório>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 #, fuzzy
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr "                        [--prefix <diretório>] [--ignoreos] [--nodeps]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <diretório>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix "
 "<diretório>]"
 
-#: rpm.c:226
+#: rpm.c:227
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <host>] [--ftpport <porta>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 #, fuzzy
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 #, fuzzy
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--provides] [--dump] [--dbpath <diretório>] [alvos]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 "                        [--provides] [--dump] [--dbpath <diretório>] [alvos]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [alvo]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [alvo]"
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 #, fuzzy
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
 "<arquivo>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 "                        [--dbpath <diretório>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                           pacote1 ... pacoteN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpm.c:250
+#: rpm.c:251
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           pacote1 ... pacoteN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "uso:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "mostra esta mensagem"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "mostra a versão do programa rpm sendo usado"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   todos os modos suportam os seguintes argumentos:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "mostra a versão do programa rpm sendo usado"
 
-#: rpm.c:299
+#: rpm.c:300
 #, fuzzy
 msgid "    --pipe <cmd>          "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "envia a saida padrão para <cmd>"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "use <arquivo> no lugar de /etc/rpmrc e $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "seja um pouco mais detalhado"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "seja _muito_ mais detalhado (para depuração)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "  Instale, atualize e pesquise (com -p) permitem que sejam usadas URLs ftp "
 "no lugar"
 
-#: rpm.c:312
+#: rpm.c:313
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   de nomes de arquivos bem como as seguintes opções:\n"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "nome do host ou IP do proxy ftp"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "número da porta do servidor ftp (ou proxy)"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "nome do host ou IP do proxy ftp"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "número da porta do servidor ftp (ou proxy)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "modo pesquisa"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 #, fuzzy
 msgid "      --dbpath <dir>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "use <diretório> como diretório para o banco de dados"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "use s como formato do cabeçalho (implica -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "use <diretório> como diretório raiz"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Opcões para especificação de pacotes:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "pesquise todos os pacotes"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "pesquise pacote (não instalado) <arquivo-pacote>"
 
-#: rpm.c:338
+#: rpm.c:339
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:339
+#: rpm.c:340
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:340
+#: rpm.c:341
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:341
+#: rpm.c:342
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: rpm.c:342
+#: rpm.c:343
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpm.c:343
+#: rpm.c:344
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "pesquise pacotes que requerem capacidade <i>"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Opcões de selecão de informação"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "mostre informação do pacote"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 #, fuzzy
 msgid "display the package's change log"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "mostre estados dos arquivos (implica -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "liste somente os arquivos de documentação (implica -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "liste somente os arquivos de configuração (implica -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -552,24 +553,24 @@ msgstr ""
 "mostre todas as informações verificáveis para cada arquivo (deve ser usado "
 "com -l, -c ou -d)"
 
-#: rpm.c:360
+#: rpm.c:361
 #, fuzzy
 msgid "list capabilities package provides"
 msgstr "lista as capacidades que o pacote fornece"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "lista dependências do pacote"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "mostra as várias scripts de [des]instalação"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -577,147 +578,147 @@ msgstr ""
 "verifique uma instalação de pacote usando as mesmas opções de especificação "
 "de pacote do -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "não verifique as dependências do pacote"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "não verifique os checksums md5 do arquivo"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "não verifique os atributos dos arquivos"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "liste as etiquetas que podem ser usadas em um formato de pesquisa"
 
-#: rpm.c:385
+#: rpm.c:386
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "instale pacote"
 
-#: rpm.c:386
+#: rpm.c:387
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "instale pacote"
 
-#: rpm.c:388
+#: rpm.c:389
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "não foi passado pacote para instalação"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "realoque o pacote para <diretório>, se realocável"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "não instale documentação"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "aliás para --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "mostre caracteres # a medida que o pacote instala (bom com -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 #, fuzzy
 msgid "don't verify package architecture"
 msgstr "não verifique a arquitetura do pacote"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "não verifique o sistema operacional do pacote"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "instale documentação"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 #, fuzzy
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "não verifique as dependências do pacote"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "não execute nenhuma script de instalação"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "imprima porcentagens a medida que o pacote vai sendo instalado"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "instale mesmo que o pacote substitua arquivos já instalados"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "reinstale se o pacote já estiver presente"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "não instale, mas diga se a instalação funcionará ou não"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "atualize pacote (mesmas opcões em --install, mais"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -725,15 +726,15 @@ msgstr ""
 "atualize para uma versão mais velha do pacote (--force em atualizações não "
 "faz isto automaticamente)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "apague (desinstale) pacote"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -741,109 +742,109 @@ msgstr ""
 "remova todos os pacotes iguais a <pacote> (normalmente um erro é gerado se "
 "<pacote> especificou múltiplos pacotes)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "não execute nenhuma script específica do pacote"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:464
+#: rpm.c:465
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "Constroi pacote, onde <estágio> é um dos seguintes:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "prep (descompacte fontes e aplique patches)"
 
 # , c-format
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "cheque lista (faça algumas checagens em %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "compile (prep e compile)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "instale (prep, compile, instale)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "pacote binário (prep, compile, instale, pacote)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "pacote bin/src (prep, compile, instale, pacote)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "pule direto para o estágio especificado (somente para c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "gere assinatura PGP"
 
-#: rpm.c:488
+#: rpm.c:489
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 #, fuzzy
 msgid "use <dir> as the build root"
 msgstr "use s como o root da construção"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "não execute nenhum estágio"
 
-#: rpm.c:494
+#: rpm.c:495
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:495
+#: rpm.c:496
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "atribua S segundos ao tempo de checagem (0 o desabilita)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -851,68 +852,68 @@ msgstr ""
 "instale pacote fonte, construa pacote binário e remova o arquivo spec, "
 "fontes, patches e ícones."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "como --rebuild, mas não construa nenhum pacote"
 
-#: rpm.c:503
+#: rpm.c:504
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: rpm.c:505
+#: rpm.c:506
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "adicione uma assinatura a um pacote"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "verifique a assinatura do pacote"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "desconsidere quaisquer assinaturas PGP"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "desconsidere quaisquer assinaturas PGP"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "desconsidere quaisquer assinaturas MD5"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "certifique que um banco de dados válido existe"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -920,7 +921,7 @@ msgstr ""
 "atribua as permissões dos arquivos para aquelas no banco de dados de pacotes "
 "usando as mesmas opções de especificação de pacote do -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -928,167 +929,167 @@ msgstr ""
 "atribua dono e grupo dos arquivos para aquelas no banco de dados de pacotes "
 "usando as mesmas opções de especificação de pacote do -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "somente um modo principal pode ser especificado"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u e --uninstall foram descontinuados e não funcionam mais.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Use -e ou --erase no lugar.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 #, fuzzy
 msgid "relocations must begin with a /"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "um tipo de pesquisa/verificação pode ser feita por vez"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "fonte de pesquisa não esperado"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "fonte de pesquisa não esperado"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "fonte de pesquisa não esperado"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "somente instalação e atualização podem ser forçadas"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 #, fuzzy
 msgid "files may only be relocated during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 #, fuzzy
 msgid "only one of --prefix or --relocate may be used"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--prefix somente pode ser usada quando se está instalando novos pacotes"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 "--prefix somente pode ser usada quando se está instalando novos pacotes"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumentos para --prefix devem começar com uma /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 "--hash (-h) somente podem ser especificado durante instalações de pacotes"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 "--replacepkgs somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 "--excludedocs somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 "--includedocs somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "somente um entre --excludedocs e --includedocs pode ser especificado"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 "--ignorearch somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 "--ignoreos somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 "--allmatches somente pode ser especificado durante desinstalações de pacotes"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 #, fuzzy
 msgid "--allfiles may only be specified during package installation"
 msgstr "--percent somente pode ser especificado durante instalações de pacotes"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 #, fuzzy
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--test somente pode ser especificado durante [des]instalações e construções "
 "de pacotes"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1096,7 +1097,7 @@ msgstr ""
 "--noscripts somente pode ser especificado durante [des]instalações e "
 "verificações de pacotes"
 
-#: rpm.c:916
+#: rpm.c:917
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1105,7 +1106,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalações e "
 "verificações de pacotes"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1114,7 +1115,7 @@ msgstr ""
 "--nodeps somente pode ser especificado durante [des]instalações e "
 "verificações de pacotes"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1122,7 +1123,7 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalações e construções "
 "de pacotes"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1130,24 +1131,24 @@ msgstr ""
 "--root (-r) somente pode ser especificado durante [des]instalações, "
 "pesquisas e reconstrução de bancos de dados"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumentos para --root (-r) devem começar com uma /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage somente pode ser usado durante a atualização de pacotes"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp somente pode ser usado durante checagem de assinaturas"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
@@ -1155,302 +1156,264 @@ msgstr ""
 "--nopgp somente pode ser usado durante checagem de assinaturas e verificação "
 "de pacotes"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 #, fuzzy
 msgid "pgp not found: "
 msgstr "não foi passado pacote para desinstalação"
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Checagem de pass phrase falhou\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Pass phrase ok.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign somente pode ser usado durante a construção de pacotes"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 #, fuzzy
 msgid "exec failed\n"
 msgstr "Construção falhou.\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos não esperados em --querytags"
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "nenhum pacote informado para checagem de assinatura"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "não foram passados pacotes para assinatura"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "não foi passado pacote para desinstalação"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "não foi passado pacote para instalação"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "não foi passado argumento para pesquisa"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "foram passados argumentos em excesso para pesquisa em todos os pacotes"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "não foi passado argumento para verificação"
 
 # , c-format
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
 # , c-format
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "mostra a versão do programa rpm sendo usado"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "uso: rpm {--help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <diretório>]"
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <arquivo>] [--dbpath <diretório>]"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <arquivo>] [--ignorearch] [--dbpath "
-"<diretório>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <arquivo>]"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <diretório>] [--noscripts] [--rcfile "
 "<arquivo>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"                        [--scripts] [--root <diretório>] [--rcfile <arquivo>]"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <diretório>] [--rcfile <arquivo>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [alvo]"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [alvo]"
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<arquivo>]"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 "                        [--sign] [--test] [--timecheck <S>] arquivo-spec"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <arquivo>] [-v] fonte1.rpm ... fonteN.rpm"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "                        arquivo.rpm ... arquivoN.rpm"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 "       rpm {--addsign} [--rcfile <arquivo>] pacote1 pacote2 ... pacoteN"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <arquivo>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   todos os modos suportam os seguintes argumentos:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "mostra a versão do programa rpm sendo usado"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
@@ -1458,251 +1421,251 @@ msgstr ""
 "  Instale, atualize e pesquise (com -p) permitem que sejam usadas URLs ftp "
 "no lugar"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   de nomes de arquivos bem como as seguintes opções:\n"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Opcões para especificação de pacotes:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "pesquise todos os pacotes"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "pesquise pacote (não instalado) <arquivo-pacote>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "pesquise pacotes que requerem capacidade <i>"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Opcões de selecão de informação"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "lista as capacidades que o pacote fornece"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "lista as capacidades que o pacote fornece"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "mostra as várias scripts de [des]instalação"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "não execute nenhum estágio"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "instale pacote"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "não execute nenhuma script de instalação"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "                        [--nomd5] [alvos]"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "instale pacote"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "instale pacote"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<estágio> <spec>    "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Use -e ou --erase no lugar.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath passado para uma operação que não usa um banco de dados"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
@@ -1710,20 +1673,20 @@ msgstr ""
 "--test somente pode ser especificado durante [des]instalações e construções "
 "de pacotes"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "não foram passados pacotes para reconstrução"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "não foi passado arquivo spec para construção"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "não foram passados arquivos tar para construção"
 
 # , c-format
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Não consegui abrir: %s\n"
@@ -1736,200 +1699,200 @@ msgstr "Não consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "RPM versão %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "Construção falhou.\n"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 # , c-format
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, fuzzy, c-format
 msgid "Two files on one line: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/files.c:714
+#: build/files.c:715
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:816
+#: build/files.c:817
 #, fuzzy, c-format
 msgid "File listed twice: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:1015
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "não foi passado pacote para desinstalação"
 
 # , c-format
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1940,7 +1903,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1969,508 +1932,526 @@ msgstr "Construção falhou.\n"
 msgid "failed to write all data to %s"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:49
+#: build/pack.c:48
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
 # , c-format
-#: build/pack.c:226
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:236
+#: build/pack.c:231
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
+#: build/pack.c:408
+#, fuzzy, c-format
+msgid "Generating signature: %d\n"
+msgstr "gere assinatura PGP"
+
 # , c-format
-#: build/pack.c:400
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:433
+#: build/pack.c:455
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/pack.c:445
+# , c-format
+#: build/pack.c:470
 #, fuzzy, c-format
-msgid "Generating signature: %d\n"
-msgstr "gere assinatura PGP"
+msgid "Unable to open sigtarget %s: %s"
+msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:458
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:465
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:471
+#: build/pack.c:504
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/pack.c:494
+# , c-format
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Não consegui abrir: %s\n"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
 # , c-format
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
 # , c-format
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
 # , c-format
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+# , c-format
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "Não consegui abrir: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, fuzzy, c-format
 msgid "Bad package specification: %s"
 msgstr "      Opcões para especificação de pacotes:"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
 # , c-format
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, fuzzy, c-format
 msgid "Bad source: %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
 # , c-format
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "argumentos para o --dbpath devem começar com uma /"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
 # , c-format
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
 # , c-format
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "%s não pode ser construido nesta arquitetura\n"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2486,184 +2467,184 @@ msgstr "Não consegui ler o arquivo spec de %s\n"
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 #, fuzzy
 msgid " failed - "
 msgstr "Construção falhou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "não foi passado pacote para instalação"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
 # , c-format
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2692,57 +2673,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2758,129 +2739,115 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
 # , c-format
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, fuzzy, c-format
 msgid "failed to stat %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
 # , c-format
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, fuzzy, c-format
 msgid "failed to open %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 #, fuzzy
 msgid "unexpected ]"
 msgstr "fonte de pesquisa não esperado"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 #, fuzzy
 msgid "unexpected }"
 msgstr "fonte de pesquisa não esperado"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2895,585 +2862,584 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr "pacote binário (prep, compile, instale, pacote)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "instale pacote"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 #, fuzzy
 msgid "override build root"
 msgstr "use s como o root da construção"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "não execute nenhum estágio"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "remova a árvore de construção quando terminar"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "pesquise todos os pacotes"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "modo pesquisa"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 #, fuzzy
 msgid "query a spec file"
 msgstr "pesquise todos os pacotes"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 #, fuzzy
 msgid "query the pacakges triggered by the package"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "modo pesquisa"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "modo pesquisa"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 #, fuzzy
 msgid "query the packages which require a capability"
 msgstr "pesquise pacotes que requerem capacidade <i>"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 #, fuzzy
 msgid "query the packages which provide a capability"
 msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 #, fuzzy
 msgid "list all configuration files"
 msgstr "liste somente os arquivos de configuração (implica -l)"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instale documentação"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "dump basic file information"
 msgstr "mostre informação do pacote"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "list files in package"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 #, fuzzy
 msgid "use the following query format"
 msgstr "fonte de pesquisa não esperado"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, fuzzy, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 #, fuzzy
 msgid "not installed "
 msgstr "não foi passado pacote para instalação"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
 # , c-format
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construção falhou.\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "não foram passados pacotes para assinatura"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "não foi passado pacote para instalação"
 
 # , c-format
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "Construção falhou.\n"
 
 # , c-format
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3552,7 +3518,7 @@ msgstr "Não consegui abrir: %s\n"
 msgid "error(%d) removing record %s from %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3563,103 +3529,103 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3672,41 +3638,41 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM versão %s\n"
 
 # , c-format
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "não foi passado pacote para instalação"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
@@ -3719,343 +3685,335 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, fuzzy, c-format
 msgid "Retrieving %s\n"
 msgstr "RPM versão %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
 # , c-format
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "não foi passado pacote para instalação"
 
 # , c-format
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "não foi passado pacote para instalação"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 #, fuzzy
 msgid "failed dependencies:\n"
 msgstr "lista dependências do pacote"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instale pacote"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 #, fuzzy
 msgid "removing these packages would break dependencies:\n"
 msgstr "lista dependências do pacote"
 
 # , c-format
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-# , c-format
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "Não consegui abrir: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, fuzzy, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, fuzzy, c-format
 msgid "Failed to read %s: %s."
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
 # , c-format
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-# , c-format
-#: lib/rpmrc.c:805
-#, fuzzy, c-format
+#: lib/rpmrc.c:808
+#, c-format
 msgid "bad option '%s' at %s:%d"
-msgstr "Não consegui abrir: %s\n"
+msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#: lib/signature.c:157
-#, fuzzy
-msgid "New Header signature\n"
-msgstr "gere assinatura PGP"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 #, fuzzy
 msgid "unable to read the signature"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 #, fuzzy
 msgid "gpg failed"
 msgstr "Construção falhou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 #, fuzzy
 msgid "gpg failed to write signature"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
@@ -4067,7 +4025,7 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "RPM versão %s\n"
@@ -4080,52 +4038,52 @@ msgstr "RPM versão %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM versão %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
 # , c-format
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -4153,216 +4111,225 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "não foi passado pacote para desinstalação"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
 # , c-format
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
 #, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "    -b<estágio> <spec>    "
+#~ msgid "New Header signature\n"
+#~ msgstr "gere assinatura PGP"
+
+#, fuzzy
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "não foi passado pacote para instalação"
+
+# , c-format
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Não consegui abrir: %s\n"
 
 #, fuzzy
 #~ msgid ""
@@ -4513,6 +4480,11 @@ msgstr "Não consegui abrir o pipe tar: %s\n"
 
 # , c-format
 #, fuzzy
+#~ msgid "cannot create %s"
+#~ msgstr "Não consegui abrir: %s\n"
+
+# , c-format
+#, fuzzy
 #~ msgid "Unable to stat icon: %s"
 #~ msgstr "Não consegui abrir: %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index 9229f3be5..4ca9ff22b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,1678 +9,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1690,7 +1660,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1716,486 +1686,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2210,182 +2195,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2414,57 +2399,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2480,125 +2465,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2613,546 +2584,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3226,7 +3196,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3237,511 +3207,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3768,205 +3733,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index ccd83d365..cf7cc99ba 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-03 20:58-0500\n"
+"POT-Creation-Date: 2000-12-12 14:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,47 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25
+#: build.c:26
 #, c-format
 msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:130 build.c:142
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:149
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:176
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:215
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:220
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:228
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
@@ -70,2342 +70,2342 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
 msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
+#: rpmqv.c:308
 msgid ""
 "                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpmqv.c:315
+#: rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
 msgid ""
 "       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:330
+#: rpmqv.c:332
 msgid ""
 "                        [--scripts] [--root <dir>] [--macros <file:...>]"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
 msgid ""
 "       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
 msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
 "       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
 "sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
 "       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
 "sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
 msgid ""
 "       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
 msgid ""
 "       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
 "<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:407
+#: rpmqv.c:409
 msgid "print the expansion of macro <expr> to stdout"
 msgstr ""
 
-#: rpmqv.c:408
+#: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 msgid "   --macros <file:...>    "
 msgstr ""
 
-#: rpmqv.c:411
+#: rpmqv.c:413
 msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:354
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:589
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:602
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:636 build/expression.c:684
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:99
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1567
+#: build/files.c:1571
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1579 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1634
+#: build/files.c:1638
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1639
+#: build/files.c:1643
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1721
+#: build/files.c:1725
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1725
+#: build/files.c:1729
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1846
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1874 build/files.c:1888
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1997
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:47
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:67
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:74
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:150
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:157
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:164
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:171
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:179
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:194
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:230
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:251
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:366
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:407
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:417
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:469
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:479
+#: build/pack.c:480
 #, c-format
 msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:494
 #, c-format
 msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:503
+#: build/pack.c:504
 #, c-format
 msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:509
+#: build/pack.c:510
 #, c-format
 msgid "Unable to write payload to %s: %s"
 msgstr ""
 
-#: build/pack.c:536
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:601
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:618
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:27
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:181
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:193
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:202
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:202
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:207
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:212
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:217
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:231
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:256
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:304
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:322
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:335
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:401
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:409
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:431 build/parsePreamble.c:438
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:495 build/parseSpec.c:378
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:508
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:520
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:532
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:572 build/parsePreamble.c:583
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
 #, c-format
 msgid "line %d: Bad %s: qualifiers: %s"
 msgstr ""
 
-#: build/parsePreamble.c:609
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:618
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:756
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:762
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:787
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:809
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:150
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:160 build/parseScript.c:218
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:170
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:210
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:132
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:180
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:192
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:263
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:271
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:282
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:296 build/parseSpec.c:305
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:484
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:539
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
 
-#: lib/cpio.c:445
+#: lib/cpio.c:444
 #, c-format
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:451
+#: lib/cpio.c:450
 #, c-format
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:758
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1244
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1247
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1248
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1269
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1270
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1279
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:554
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:583
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:937
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:996
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1084
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1106
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1119
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1133
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1154
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1212
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1279
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1505
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1609
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1659
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1762
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1793
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:88 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:90 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:382
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:385
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:416
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:421
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:444
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:445 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:445 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2434,57 +2434,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2500,7 +2500,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2397 lib/header.c:2414 lib/header.c:2434
+#: lib/header.c:2538 lib/header.c:2555 lib/header.c:2575
 msgid "(not a number)"
 msgstr ""
 
@@ -2529,96 +2529,96 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:215
+#: lib/header.c:218
 msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:250 lib/header.c:885 lib/install.c:380
+#: lib/header.c:253 lib/header.c:1024 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1308
+#: lib/header.c:1449
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1750
+#: lib/header.c:1891
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1780
+#: lib/header.c:1921
 msgid "missing } after %{"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1935
 msgid "empty tag format"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1806
+#: lib/header.c:1947
 msgid "empty tag name"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1823
+#: lib/header.c:1964
 msgid "unknown tag"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1850
+#: lib/header.c:1991
 msgid "] expected at end of array"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1868
+#: lib/header.c:2009
 msgid "unexpected ]"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1872
+#: lib/header.c:2013
 msgid "unexpected }"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1932
+#: lib/header.c:2073
 msgid "? expected in expression"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1941
+#: lib/header.c:2082
 msgid "{ expected after ? in expression"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1954 lib/header.c:1995
+#: lib/header.c:2095 lib/header.c:2136
 msgid "} expected in expression"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1964
+#: lib/header.c:2105
 msgid ": expected following ? subexpression"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:1980
+#: lib/header.c:2121
 msgid "{ expected after : in expression"
 msgstr ""
 
 #. @-observertrans@
-#: lib/header.c:2005
+#: lib/header.c:2146
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2176
+#: lib/header.c:2317
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2687,7 +2687,7 @@ msgstr ""
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
@@ -2723,456 +2723,455 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:89
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:146
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:130 lib/rpmchecksig.c:264
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:135
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:139
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:147 lib/rpmchecksig.c:278
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:151 lib/rpmchecksig.c:283
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:184
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:190
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:270
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:434 lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:436 lib/rpmchecksig.c:450
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:439 lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:447
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3246,7 +3245,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2341
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3262,511 +3261,501 @@ msgstr ""
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1142 lib/rpmdb.c:1676
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1729
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1740
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1749
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1891
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1954
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1970
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1979
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2366
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2370
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2376
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2378
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2385
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2396
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2419
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2451
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2469
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2477
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2479
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2489
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2491
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:532
+#: lib/rpminstall.c:533
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:149
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:152
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:312
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:316
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:323
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:358
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:363
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:553
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:558
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:575
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:620
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:657
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:674 lib/rpmrc.c:748
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:691 lib/rpmrc.c:713
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:700
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:740
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:807
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1204
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1205
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:116
-#, c-format
-msgid "sigsize         : %d\n"
+#: lib/signature.c:115
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:117
+#: lib/signature.c:119
 #, c-format
-msgid "Header + Archive: %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:123
 #, c-format
-msgid "expected size   : %d\n"
-msgstr ""
-
-#: lib/signature.c:122
-msgid "file is not regular -- skipping size check\n"
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:141
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:145
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#: lib/signature.c:159
-msgid "New Header signature\n"
-msgstr ""
-
-#. 8-byte pad
-#: lib/signature.c:171 lib/signature.c:208
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:172 lib/signature.c:209
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:271
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:282
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:289
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:294
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:305 lib/signature.c:382
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:310
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:348 lib/signature.c:693
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:359
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:366
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:371
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:387
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:420
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:499 lib/signature.c:561
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:559 lib/signature.c:632
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:634
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:722
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:726 lib/signature.c:779
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:759
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:771
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:437
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:463 lib/transaction.c:546
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:468
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:539
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:691
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3793,205 +3782,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
 msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 9b2e1beaf..50f6a42e9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,498 +1,498 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 2000-08-08 01:20+0300\n"
-"Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
+"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 1999-04-03 12:20+0200\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÓÂÏÒËÉ:\n"
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
-msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ spec ÆÁÊÌÁ: %s\n"
+msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ spec ÆÁÊÌÁ %s: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ tar: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "ïÛÉÂËÁ ŞÔÅÎÉÑ ÆÁÊÌÁ spec ÉÚ %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "îÅ ÍÏÇÕ ĞÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
-msgstr "ÎÅ ÍÏÇÕ ĞÏÌÕŞÉÔØ ÉÎÆÏÒÍÁÃÉÀ ÏÂ %s: %s"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÏÌÕŞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "îÅ ÏÂÙŞÎÙÊ ÆÁÊÌ: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "æÁÊÌ %s ÎÅ ĞÏÈÏÖ ÎÁ spec ÆÁÊÌ.\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
-msgstr "ãÅÌÅ×ÙÅ ĞÌÁÔÆÏÒÍÙ: %s\n"
+msgstr "ãÅÌÅ×ÙÅ ĞÌÁÔÆÏÒÍÙ ÄÌÑ ÓÂÏÒËÉ: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr "óÂÏÒËÁ ÄÌÑ ÃÅÌÅ×ÏÊ ĞÌÁÔÆÏÒÍÙ %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM ×ÅÒÓÉÑ %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "íÏÖÅÔ Ó×ÏÂÏÄÎÏ ÒÁÓĞÒÏÓÔÒÁÎÑÔØÓÑ ÎÁ ÕÓÌÏ×ÉÑÈ GNU GPL."
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr "éÓĞÏÌØÚÏ×ÁÎÉÅ: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <ËÁÔÁÌÏÇ>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <ËÁÔÁÌÏÇ>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁÌÏÇ>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <ËÁÔ.>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <ÁÄÒÅÓ>] [--ftpport <ĞÏÒÔ>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <ÁÄÒÅÓ>] [--httpport <ĞÏÒÔ>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                        [--justdb] [--noorder] [--relocate "
 "ÓÔÁÒÙÊĞÕÔØ=ÎÏ×ÙÊĞÕÔØ]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <ĞÕÔØ>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] file1.rpm ... fileN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                        [--oldpackage] [--root <ËÁÔÁÌÏÇ>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <ËÁÔ.>] [--prefix <ËÁÔ.>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <host>] [--httpport <ĞÏÒÔ>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate oldpath=newpath]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <ĞÕÔØ>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        file1.rpm ... fileN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <ËÁÔÁÌÏÇ>] [ÃÅÌÉ]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <ËÁÔ>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [ÃÅÌÉ]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [ÃÅÌØ]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [ÃÅÌØ]"
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} ÆÁÊÌ1.rpm ... ÆÁÊÌN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <ËÁÔÁÌÏÇ>] [--noscripts] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <ËÁÔÁÌÏÇ>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] ĞÁËÅÔ1 ... ĞÁËÅÔN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <ÆÁÊÌ>] ĞÁËÅÔ1 ĞÁËÅÔ2 ... ĞÁËÅÔN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <ÆÁÊÌ>] ĞÁËÅÔ1 ĞÁËÅÔ2 ... ĞÁËÅÔN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ÆÁÊÌ>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           ĞÁËÅÔ1 ... ĞÁËÅÔN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <ÆÁÊÌ>] [--dbpath <ËÁÔÁÌÏÇ>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr "éÓĞÏÌØÚÏ×ÁÎÉÅ:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "×Ù×ÅÓÔÉ ÜÔÏ ÓÏÏÂİÅÎÉÅ"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "×Ù×ÅÓÔÉ ×ÅÒÓÉÀ ÉÓĞÏÌØÚÕÅÍÏÇÏ rpm"
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr "   ÷ÓÅ ÒÅÖÉÍÙ ĞÏÄÄÅÒÖÉ×ÁÀÔ ÓÌÅÄÕÀİÉÅ ÁÒÇÕÍÅÎÔÙ:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<ÉÍÑ> <ĞÏÄÓÔÁÎÏ×ËÁ>'"
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr "ÏĞÒÅÄÅÌÉÔØ ÍÁËÒÏÓ <ÉÍÑ> ÓÏ ÚÎÁŞÅÎÉÅÍ <ĞÏÄÓÔÁÎÏ×ËÁ>"
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<name>+'      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr "×Ù×ÅÓÔÉ ÚÎÁŞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <cmd>          "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "ĞÏÓÌÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ × <cmd>"
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <ÆÁÊÌ>     "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <ÆÁÊÌ> ×ÍÅÓÔÏ /etc/rpmrc É $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
-msgstr ""
+msgstr "ĞÏËÁÚÁÔØ ÔÅËÕİÅÅ ÚÎÁŞÅÎÉÅ rpmrc É ÍÁËÒÏÓÏ×"
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "ÂÙÔØ ÎÅÍÎÏÇÏ ÒÁÚÇÏ×ÏÒŞÉ×ÅÅ"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "ÂÙÔØ ïşåîø ÒÁÚÇÏ×ÏÒŞÉ×ÙÍ (ÄÌÑ ÏÔÌÁÄËÉ)"
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   õÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ É ÚÁĞÒÏÓ (Ó -p) ÄÏĞÕÓËÁÀÔ ÉÓĞÏÌØÚÏ×ÁÎÉÅ ftp URL "
 "×ÍÅÓÔÏ"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "   ÉÍÅÎ ÆÁÊÌÏ× Á ÔÁËÖÅ ÓÌÅÄÕÀİÉÅ ÏĞÃÉÉ:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <ÁÄÒÅÓ>  "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ ftp proxy"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <ĞÏÒÔ>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "ÎÏÍÅÒ ĞÏÒÔÁ ftp-ÓÅÒ×ÅÒÁ (ÉÌÉ proxy)"
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <ÁÄÒÅÓ>  "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr "ÉÍÑ ÉÌÉ IP-ÁÄÒÅÓ http proxy"
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr "      --httpport <ĞÏÒÔ>    "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr "ÎÏÍÅÒ ĞÏÒÔÁ http-ÓÅÒ×ÅÒÁ (ÉÌÉ proxy)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "ÒÅÖÉÍ ÚÁĞÒÏÓÁ"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <ËÁÔÁÌÏÇ>  "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÁÔÁÌÏÇ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <qfmt> ËÁË ÆÏÒÍÁÔ ÚÁÇÏÌÏ×ËÁ (ĞÏÄÒÁÚÕÍÅ×ÁÅÔ -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <ËÁÔÁÌÏÇ>    "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <ËÁÔÁÌÏÇ> ËÁË ËÏÒÎÅ×ÏÊ ËÁÔÁÌÏÇ"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      ïĞÃÉÉ ÓĞÅÃÉÆÉËÁÃÉÉ ĞÁËÅÔÁ:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "ÚÁĞÒÏÓÉÔØ ×ÓÅ ĞÁËÅÔÙ"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <ÆÁÊÌ>+        "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "ÎÁÊÔÉ ĞÁËÅÔ, ËÏÔÏÒÏÍÕ ĞÒÉÎÁÄÌÅÖÉÔ <ÆÁÊÌ>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <ÆÁÊÌ ĞÁËÅÔÁ>+ "
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "ÚÁĞÒÏÓÉÔØ (ÎÅÕÓÔÁÎÏ×ÌÅÎÎÙÊ) ĞÁËÅÔ <ÆÁÊÌ ĞÁËÅÔÁ>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pkg>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "ÚÁĞÒÏÓÉÔØ ĞÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÁÍÉ ÎÁ ĞÁËÅÔ <pkg>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <cap>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr "ÎÁÊÔÉ ĞÁËÅÔÙ, ĞÒÅÄÏÓÔÁ×ÌÑÀİÉÅ ÓÅÒ×ÉÓ <cap>"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <cap>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr "ÎÁÊÔÉ ĞÁËÅÔÙ, ÔÒÅÂÕÀİÉÅ ÓÅÒ×ÉÓÁ <cap>"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      ïĞÃÉÉ ×ÙÂÏÒÁ ÉÎÆÏÒÍÁÃÉÉ:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ĞÁËÅÔÅ"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "×Ù×ÅÓÔÉ ĞÒÏÔÏËÏÌ ÉÚÍÅÎÅÎÉÊ ĞÁËÅÔÁ"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "×Ù×ÅÓÔÉ ÓĞÉÓÏË ÆÁÊÌÏ× ĞÁËÅÔÁ"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "ĞÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÏ× (ĞÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "×Ù×ÅÓÔÉ ÔÏÌØËÏ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ (ĞÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "×Ù×ÅÓÔÉ ÔÏÌØËÏ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ (ĞÏÄÒÁÚÕÍÅ×ÁÅÔ -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -500,23 +500,23 @@ msgstr ""
 "ĞÏËÁÚÁÔØ ×ÓÀ ËÏÎÔÒÏÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÄÌÑ ËÁÖÄÏÇÏ ÆÁÊÌÁ (ÄÏÌÖÎÏ ÉÓĞÏÌØÚÏ×ÁÔØÓÑ "
 "Ó -l, -c ÉÌÉ -d)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "ĞÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ĞÒÅÄÏÓÔÁ×ÌÑÅÍÙÅ ĞÁËÅÔÏÍ"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "ĞÏËÁÚÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ĞÁËÅÔÁ"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "×Ù×ÅÓÔÉ ÒÁÚÎÏÏÂÒÁÚÎÙÅ [ÄÅ]ÉÎÓÔÁÌÌÑÃÉÏÎÎÙÅ ÓËÒÉĞÔÙ"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr "ĞÏËÁÚÁÔØ ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÙ, ÓÏÄÅÒÖÁİÉÅÓÑ × ĞÁËÅÔÅ"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -524,157 +524,157 @@ msgstr ""
 "×ÅÒÉÆÉÃÉÒÏ×ÁÔØ ÉÎÓÔÁÌÌÑÃÉÀ ĞÁËÅÔÁ, ÉÓĞÏÌØÚÕÑ ÔÅ ÖÅ ÏĞÃÉÉ ÓĞÅÃÉÆÉËÁÃÉÉ "
 "ĞÁËÅÔÁ, ŞÔÏ É -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÅÊ ĞÁËÅÔÁ"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÙÅ md5-ÓÕÍÍÙ ÆÁÊÌÏ×"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÁÔÔÒÉÂÕÔÙ ÆÁÊÌÏ×"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "×Ù×ÅÓÔÉ ÔÜÇÉ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÙ × ÆÏÒÍÁÔÅ ÚÁĞÒÏÓÁ"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <ÆÁÊÌ ĞÁËÅÔÁ>"
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <ÆÁÊÌ ĞÁËÅÔÁ>      "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ĞÁËÅÔ"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <ĞÕÔØ>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr "ĞÒÏĞÕÓÔÉÔØ ÆÁÊÌÙ × ĞÕÔÉ <ĞÕÔØ>"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <oldpath>=<newpath>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "ĞÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ ÉÚ <oldpath> × <newpath>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr "ĞÅÒÅÍÅÓÔÉÔØ ÆÁÊÌÙ × ÎÅĞÅÒÅÍÅİÁÅÍÏÍ ĞÁËÅÔÅ"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <ËÁÔÁÌÏÇ>  "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "ĞÅÒÅÍÅÓÔÉÔØ ĞÁËÅÔ × <ËÁÔÁÌÏÇ>, ÅÓÌÉ ĞÁËÅÔ ÜÔÏ ĞÏÚ×ÏÌÑÅÔ"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÏËÕÍÅÎÔÁÃÉÀ"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "ÓÏËÒÁİÅÎÉÅ ÄÌÑ --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "×Ù×ÏÄÉÔØ \"#\" ĞÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ (ÈÏÒÏÛÏ Ó -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÷óå ÆÁÊÌÙ, ÄÁÖÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ, ËÏÔÏÒÙÅ ÍÏÇÌÉ ÂÙ ÂÙÔØ "
 "ĞÒÏĞÕİÅÎÙ"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÁÒÈÉÔÅËÔÕÒÕ ĞÁËÅÔÁ"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÄÉÓËÏ×ÏÅ ĞÒÏÓÔÒÁÎÓÔ×Ï ĞÅÒÅÄ ÕÓÔÁÎÏ×ËÏÊ"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÏĞÅÒÁÃÉÏÎÎÕÀ ÓÉÓÔÅÍÕ ĞÁËÅÔÁ"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ÄÏËÕÍÅÎÔÁÃÉÀ"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "ÏÂÎÏ×ÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ, ÎÏ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ ÆÁÊÌÏ×ÕÀ ÓÉÓÔÅÍÕ"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "ÎÅ ÍÅÎÑÔØ ĞÏÒÑÄÏË ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÏ× ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÚÁ×ÉÓÉÍÏÓÔÅÊ"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ËÁËÉÈ-ÌÉÂÏ ÕÓÔÁÎÏ×ÏŞÎÙÈ ÓËÒÉĞÔÏ×"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÏ×, ×Ú×ÅÄÅÎÎÙÈ ÎÁ ÜÔÏÔ ĞÁËÅÔ"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "×Ù×ÏÄÉÔØ ĞÒÏÃÅÎÔ ÇÏÔÏ×ÎÏÓÔÉ ĞÏ ÍÅÒÅ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
-msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÁÖÅ ÅÓÌÉ ĞÁËÅÔ ĞÅÒÅĞÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ"
+msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÄÁÖÅ ÅÓÌÉ ĞÁËÅÔ ĞÅÒÅĞÉÛÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÆÁÊÌÙ"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
-msgstr "ĞÅÒÅÕÓÔÁÎÏ×ÉÔØ ÅÓÌÉ ĞÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
+msgstr "ĞÅÒÅÕÓÔÁÎÏ×ÉÔØ, ÅÓÌÉ ĞÁËÅÔ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
-msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂİÉÔØ ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ"
+msgstr "ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, Á ÔÏÌØËÏ ÓÏÏÂİÉÔØ, ÕÄÁÓÔÓÑ ÌÉ ÕÓÔÁÎÏ×ËÁ"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <ÆÁÊÌ ĞÁËÅÔÁ>"
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr "    -U <ÆÁÊÌ ĞÁËÅÔÁ>      "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ĞÁËÅÔÁ (ÔÅ ÖÅ ÏĞÃÉÉ, ŞÔÏ É Ó --install, ĞÌÀÓ)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
-"ÏÔËÁÔ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ĞÁËÅÔÁ (--force ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÄÅÌÁÅÔ ÜÔÏ "
+"ÏÔËÁÔ ÎÁ ÂÏÌÅÅ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ĞÁËÅÔÁ (--force ĞÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÄÅÌÁÅÔ ÜÔÏ "
 "Á×ÔÏÍÁÔÉŞÅÓËÉ)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr "    --erase <ĞÁËÅÔ>  "
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "ÕÄÁÌÉÔØ (ÄÅÉÎÓÔÁÌÌÉÒÏ×ÁÔØ) ĞÁËÅÔ"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -682,165 +682,165 @@ msgstr ""
 "ÕÄÁÌÉÔØ ×ÓÅ ĞÁËÅÔÙ, ÓÏ×ĞÁÄÁÀİÉÅ Ó <ĞÁËÅÔ> (ÏÂÙŞÎÏ, ÅÓÌÉ <ĞÁËÅÔ> "
 "ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÅÓËÏÌØËÉÍ ĞÁËÅÔÁÍ, ÇÅÎÅÒÉÒÕÅÔÓÑ ÏÛÉÂËÁ)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ÎÉËÁËÉÈ ÓËÒÉĞÔÏ×, ÓĞÅÃÉÆÉŞÎÙÈ ÄÌÑ ĞÁËÅÔÁ"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<stage> <spec>      "
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<stage> <tarball>   "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "ÓÏÂÒÁÔØ ĞÁËÅÔ, ÇÄÅ <stage> - ÏÄÎÏ ÉÚ:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
-msgstr "prep (ÉÓĞÏÌÎÉÔØ %prep)"
+msgstr "prep (ÓÅËÃÉÑ %prep, ÒÁÚ×ÅÒÎÕÔØ ÉÓÈÏÄÎÉËÉ É ÎÁÌÏÖÉÔØ ÚÁĞÌÁÔÙ)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "list check (ĞÒÏÉÚ×ÅÓÔÉ ĞÒÏ×ÅÒËÕ ÓÅËÃÉÉ %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "compile (ÉÓĞÏÌÎÉÔØ %prep É %build)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "install (ÉÓĞÏÌÎÉÔØ %prep, %build É %install)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "binary package (ÉÓĞÏÌÎÉÔØ %prep, %build, %install É ÓÏÚÄÁÔØ RPM)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "bin/src package (ÉÓĞÏÌÎÉÔØ %prep, %build, %install, ÓÏÚÄÁÔØ RPM É SRPM)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "ĞÅÒÅÊÔÉ ÎÅĞÏÓÒÅÄÓÔ×ÅÎÎÏ Ë ÕËÁÚÁÎÎÏÍÕ ÜÔÁĞÕ (ÔÏÌØËÏ ÄÌÑ c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "ĞÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÄÅÒÅ×Ï ÉÓÈÏÄÎÉËÏ×"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
-msgstr "ĞÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÉÓÈÏÄÎÉËb"
+msgstr "ĞÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÉÓÈÏÄÎÉËÉ"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr "ÕÄÁÌÉÔØ spec-ÆÁÊÌ ĞÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ PGP/GPG-ĞÏÄĞÉÓØ"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <ËÁÔ.>  "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "ÉÓĞÏÌØÚÏ×ÁÔØ <ËÁÔ.> ËÁË ËÏÒÎÅ×ÏÊ ÄÌÑ ĞÏÓÔÒÏÅÎÉÑ ĞÁËÅÔÁ"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr "      --target=<ĞÌÁÔÆÏÒÍÁ>+"
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
-msgstr "ĞÏÓÔÒÏÉÔØ ĞÁËÅÔÙ ÄÌÑ ÃÅÌÅ×ÙÈ ĞÌÁÔÆÏÒÍ ĞÌÁÔÆÏÒÍÁ1...ĞÌÁÔÆÏÒÍÁN"
+msgstr "ÓÏÂÒÁÔØ ĞÁËÅÔÙ ÄÌÑ ÃÅÌÅ×ÙÈ ĞÌÁÔÆÏÒÍ ĞÌÁÔÆÏÒÍÁ1...ĞÌÁÔÆÏÒÍÁN"
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁĞÏ×"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <secs>  "
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ĞÒÏ×ÅÒËÕ ×ÒÅÍÅÎÉ × <secs> ÓÅËÕÎÄ (0 ÏÔÍÅÎÑÅÔ ÅÅ)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <src_pkg>   "
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
-"ÕÓÔÁÎÏ×ÉÔØ SRPM, ÓÏÂÒÁÔØ RPM É ÕÄÁÌÉÔØ spec-ÆÁÊÌ, ÆÁÊÌÙ Ó ÉÓÈÏÄÎÙÍÉ "
-"ÔÅËÓÔÁÍÉ, ĞÁÔŞÉ É ĞÉËÔÏÇÒÁÍÍÙ."
+"ÕÓÔÁÎÏ×ÉÔØ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ, ÓÏÂÒÁÔØ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ É ÕÄÁÌÉÔØ spec-ÆÁÊÌ, ÆÁÊÌÙ "
+"Ó ÉÓÈÏÄÎÙÍÉ ÔÅËÓÔÁÍÉ, ÚÁĞÌÁÔÙ É ĞÉËÔÏÇÒÁÍÍÙ."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <src_pkg> "
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "ËÁË --rebuild, ÎÏ ÎÅ ÓÏÂÉÒÁÅÔ ÎÉËÁËÉÈ ĞÁËÅÔÏ×"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pkg>+       "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "ĞÏÄĞÉÓÁÔØ ĞÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕİÕÀ ĞÏÄĞÉÓØ)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pkg>+      "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "ÄÏÂÁ×ÉÔØ ĞÏÄĞÉÓØ Ë ĞÁËÅÔÕ"
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pkg>+"
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr "    -K <ĞÁËÅÔ>+           "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "ĞÒÏ×ÅÒÉÔØ ĞÏÄĞÉÓØ × ĞÁËÅÔÅ"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "ĞÒÏĞÕÓÔÉÔØ ×ÓÅ PGP-ĞÏÄĞÉÓÉ"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr "ĞÒÏĞÕÓÔÉÔØ ×ÓÅ GPG-ĞÏÄĞÉÓÉ"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "ĞÒÏĞÕÓÔÉÔØ ×ÓÅ MD5-ĞÏÄĞÉÓÉ"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "ÕÂÅÄÉÔØÓÑ, ŞÔÏ ÓÕİÅÓÔ×ÕÅÔ ĞÒÁ×ÉÌØÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "ĞÅÒÅÓÔÒÏÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÉÚ ÓÕİÅÓÔ×ÕÀİÅÊ ÂÁÚÙ"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -848,7 +848,7 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÉÔØ ĞÒÁ×Á ÄÏÓÔÕĞÁ ÆÁÊÌÏ× ÔÁËÉÅ ÖÅ, ËÁË × ÂÁÚÅ ÄÁÎÎÙÈ ĞÁËÅÔÁ, "
 "ÉÓĞÏÌØÚÕÑ ÔÅ ÖÅ ÏĞÃÉÉ ÓĞÅÃÉÆÉËÁÃÉÉ ĞÁËÅÔÁ, ŞÔÏ É -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -856,150 +856,150 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÉÔØ ÈÏÚÑÉÎÁ É ÇÒÕĞĞÕ ÆÁÊÌÏ× ÔÁËÉÅ ÖÅ, ËÁË × ÂÁÚÅ ÄÁÎÎÙÈ ĞÁËÅÔÁ, "
 "ÉÓĞÏÌØÚÕÑ ÔÅ ÖÅ ÏĞÃÉÉ ÓĞÅÃÉÆÉËÁÃÉÉ ĞÁËÅÔÁ, ŞÔÏ É -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÏÓÎÏ×ÎÙÈ ÒÅÖÉÍÏ×"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "ÏĞÃÉÉ -u É --uninstall ÕÓÔÁÒÅÌÉ É ÂÏÌØÛÅ ÎÅ ÒÁÂÏÔÁÀÔ.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "÷ÍÅÓÔÏ ÎÉÈ ÉÓĞÏÌØÚÕÊÔÅ -e ÉÌÉ --erase.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "ĞÅÒÅÍÅİÅÎÉÑ ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "ĞÅÒÅÍÅİÅÎÉÑ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "ĞÅÒÅÍÅİÅÎÉÑ ÄÏÌÖÎÙ ÉÍÅÔØ / ĞÏÓÌÅ ="
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr "ÉÓËÌÀŞÅÎÉÑ ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ĞÒÉ ÏÂÒÁÂÏÔËÅ ÁÒÇÕÍÅÎÔÏ× (%d) :-(\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "ÚÁ ÏÄÉÎ ÒÁÚ ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌÎÅÎ ÔÏÌØËÏ ÏÄÉÎ ÔÉĞ ĞÒÏ×ÅÒËÉ ÉÌÉ ÚÁĞÒÏÓÁ"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏŞÎÉË ÚÁĞÒÏÓÁ"
+msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÆÌÁÇÉ ÚÁĞÒÏÓÁ"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
-msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏŞÎÉË ÚÁĞÒÏÓÁ"
+msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÆÏÒÍÁÔ ÚÁĞÒÏÓÁ"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÉÓÔÏŞÎÉË ÚÁĞÒÏÓÁ"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "ĞÒÉÎÕÄÉÔÅÌØÎÙÍÉ ÍÏÇÕÔ ÂÙÔØ ÔÏÌØËÏ ÕÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ, ÕÄÁÌÅÎÉÅ ÉÓÈÏÄÎÉËÏ× "
 "É spec-ÆÁÊÌÁ"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "ÆÁÊÌÙ ÍÏÇÕÔ ÂÙÔØ ĞÅÒÅÍÅİÅÎÙ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÏÄÎÁ ÉÚ ÏĞÃÉÊ --prefix ÉÌÉ --relocate"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "ÏĞÃÉÉ --relocate É --excludepath ÍÏÖÎÏ ÉÓĞÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ "
 "ÎÏ×ÙÈ ĞÁËÅÔÏ×"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "ÏĞÃÉÀ --prefix ÍÏÖÎÏ ÉÓĞÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÎÏ×ÙÈ ĞÁËÅÔÏ×"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --prefix ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --hash (-h) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --percent ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --replacefiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --replacepkgs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --excludedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --includedocs ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ÏÄÎÁ ÉÚ ÏĞÃÉÊ --excludedocs ÉÌÉ --includedocs"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --ignorearch ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --ignoreos ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --ignoresize ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "ÏĞÃÉÑ --allmatches ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÄÁÌÅÎÉÉ ĞÁËÅÔÁ"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "ÏĞÃÉÑ --allfiles ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ĞÁËÅÔÁ"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "ÏĞÃÉÑ --justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ĞÁËÅÔÁ"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1007,7 +1007,7 @@ msgstr ""
 "ÏĞÃÉÑ --noscripts ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
 "×ÅÒÉÆÉËÁÃÉÉ ĞÁËÅÔÁ"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1015,7 +1015,7 @@ msgstr ""
 "ÏĞÃÉÑ --notriggers ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
 "×ÅÒÉÆÉËÁÃÉÉ ĞÁËÅÔÁ"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1023,7 +1023,7 @@ msgstr ""
 "ÏĞÃÉÑ --nodeps ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÓÂÏÒËÅ, ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É "
 "×ÅÒÉÆÉËÁÃÉÉ ĞÁËÅÔÏ×"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1031,7 +1031,7 @@ msgstr ""
 "ÏĞÃÉÑ --test ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ É ÓÂÏÒËÅ "
 "ĞÁËÅÔÁ"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1039,732 +1039,692 @@ msgstr ""
 "ÏĞÃÉÑ --root (-r) ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ, ÕÄÁÌÅÎÉÉ, "
 "ÚÁĞÒÏÓÁÈ ĞÁËÅÔÁ É ĞÅÒÅÓÔÒÏÅÎÉÉ ÂÁÚÙ ÄÁÎÎÙÈ"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ --root (-r) ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 "ÏĞÃÉÑ --oldpackage ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ĞÒÉ ÏÂÎÏ×ÌÅÎÉÉ ĞÁËÅÔÏ×"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "ÏĞÃÉÑ --nopgp ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ĞÒÉ ĞÒÏ×ÅÒËÅ ĞÏÄĞÉÓÉ"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr "ÏĞÃÉÑ --nogpg ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ĞÒÉ ĞÒÏ×ÅÒËÅ ĞÏÄĞÉÓÉ"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "ÏĞÃÉÑ --nomd5 ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ĞÒÉ ĞÒÏ×ÅÒËÅ ĞÏÄĞÉÓÉ É "
 "×ÅÒÉÆÉËÁÃÉÉ ĞÁËÅÔÁ"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
-msgstr ""
+msgstr "ÎÅÔ ÆÁÊÌÏ× ÄÌÑ ĞÏÄĞÉÓÉ\n"
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "ÎÅÔ ÄÏÓÔÕĞÁ Ë ÆÁÊÌÕ %s\n"
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
-msgstr "pgp ÎÅ ÎÁÊÄÅÎ: "
+msgstr "pgp ÎÅ ÎÁÊÄÅÎÁ: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
-msgstr "÷×ÅÄÉÔÅ ĞÁÒÏÌØ: "
+msgstr "÷×ÅÄÉÔÅ ËÌÀŞÅ×ÕÀ ÆÒÁÚÕ: "
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
-msgstr "îÅ×ÅÒÎÙÊ ĞÁÒÏÌØ\n"
+msgstr "îÅ×ÅÒÎÁÑ ËÌÀŞÅ×ÁÑ ÆÒÁÚÁ\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
-msgstr "ğÁÒÏÌØ ĞÒÉÎÑÔ.\n"
+msgstr "ëÌÀŞÅ×ÁÑ ÆÒÁÚÁ ĞÒÉÎÑÔÁ.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ.\n"
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "ÏĞÃÉÑ --sign ÍÏÖÅÔ ÂÙÔØ ÉÓĞÏÌØÚÏ×ÁÎÁ ÔÏÌØËÏ ĞÒÉ ÓÂÏÒËÅ ĞÁËÅÔÏ×"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr "ÚÁĞÕÓË ÎÅ ÕÄÁÌÓÑ\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ĞÒÏ×ÅÒËÉ ĞÏÄĞÉÓÉ"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ĞÏÄĞÉÓÉ"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "× ÚÁĞÒÏÓÅ ËÏ ×ÓÅÍ ĞÁËÅÔÁÍ ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁĞÒÏÓÁ"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr "× ÚÁĞÒÏÓÅ ×ÅÒÉÆÉËÁÃÉÉ ×ÓÅÈ ĞÁËÅÔÏ× ÚÁÄÁÎÙ ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ĞÁËÅÔ: %s\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
-msgstr "ÚÁÄÁÎÎÙÊ ÁÒÇÕÍÅÎÔ - ÎÅ ĞÁËÅÔ RPM\n"
+msgstr "ÚÁÄÁÎÎÙÊ ÁÒÇÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ĞÁËÅÔÏÍ RPM\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
-msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÈÅÄÅÒÁ ÉÚ ĞÁËÅÔÁ\n"
+msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÚÁÇÏÌÏ×ËÁ ÉÚ ĞÁËÅÔÁ\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ payload: %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<ÉÍÑ> <ĞÏÄÓÔÁÎÏ×ËÁ>'"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "×Ù×ÅÓÔÉ ÚÎÁŞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
-msgstr ""
-"éÓĞÏÌØÚÏ×ÁÎÉÅ:\n"
-"       rpm {--help}\n"
+msgstr "éÓĞÏÌØÚÏ×ÁÎÉÅ: %s {--help}\n"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <ËÁÔÁÌÏÇ>]\n"
 
-#: rpmqv.c:299
-#, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+#: rpmqv.c:301
+#, c-format
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <ÆÁÊÌ>] [--dbpath <ËÁÔÁÌÏÇ>]\n"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <file>] [--ignorearch] [--dbpath <ËÁÔÁÌÏÇ>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <ÆÁÊÌ>]"
-
-#: rpmqv.c:323
-#, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+#: rpmqv.c:325
+#, c-format
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--erase -e} [--root <ËÁÔÁÌÏÇ>] [--noscripts] [--rcfile <ÆÁÊÌ>]\n"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"                        [--scripts] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]"
-
-#: rpmqv.c:337
-#, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+#: rpmqv.c:339
+#, c-format
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--verify -V -y} [-afpg] [--root <ËÁÔÁÌÏÇ>] [--rcfile <ÆÁÊÌ>]\n"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [ÃÅÌØ]\n"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [ÃÅÌØ]\n"
 
-#: rpmqv.c:346
-#, fuzzy, c-format
+#: rpmqv.c:348
+#, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<ÆÁÊÌ>]\n"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=platform1[,platform2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] specfile"
 
-#: rpmqv.c:350
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#: rpmqv.c:352
+#, c-format
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <ÆÁÊÌ>] [-v] specfile\n"
 
-#: rpmqv.c:351
-#, fuzzy, c-format
+#: rpmqv.c:353
+#, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
 
-#: rpmqv.c:352
-#, fuzzy, c-format
+#: rpmqv.c:354
+#, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <ÆÁÊÌ>] [-v] source1.rpm ... sourceN.rpm\n"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} ÆÁÊÌ1.rpm ... ÆÁÊÌN.rpm\n"
 
-#: rpmqv.c:357
-#, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+#: rpmqv.c:359
+#, c-format
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <ÆÁÊÌ>] ĞÁËÅÔ1 ĞÁËÅÔ2 ... ĞÁËÅÔN\n"
 
-#: rpmqv.c:358
-#, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+#: rpmqv.c:360
+#, c-format
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <ÆÁÊÌ>] ĞÁËÅÔ1 ĞÁËÅÔ2 ... ĞÁËÅÔN"
 
-#: rpmqv.c:359
-#, fuzzy, c-format
+#: rpmqv.c:361
+#, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <ÆÁÊÌ>]\n"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr "   ÷ÓÅ ÒÅÖÉÍÙ ĞÏÄÄÅÒÖÉ×ÁÀÔ ÓÌÅÄÕÀİÉÅ ÁÒÇÕÍÅÎÔÙ:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<ÉÍÑ> <ĞÏÄÓÔÁÎÏ×ËÁ>'"
 
-#: rpmqv.c:406
-#, fuzzy
-msgid "   --eval '<expr>+'       "
+#: rpmqv.c:408
+msgid "   --eval '<name>+'       "
 msgstr "   --eval '<ÉÍÑ>+'       "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "×Ù×ÅÓÔÉ ÚÎÁŞÅÎÉÅ ÍÁËÒÏÓÁ <ÉÍÑ>"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <ËÏÍÁÎÄÁ>      "
 
-#: rpmqv.c:410
-#, fuzzy
-msgid "   --macros <file:...>    "
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr "      --rcfile <ÆÁÊÌ>     "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr "   --dbpath <ËÁÔÁÌÏÇ>     "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr "   --root <ËÁÔÁÌÏÇ>       "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "  õÓÔÁÎÏ×ËÁ, ÏÂÎÏ×ÌÅÎÉÅ É ÚÁĞÒÏÓ (Ó -p) ÄÏĞÕÓËÁÀÔ ÉÓĞÏÌØÚÏ×ÁÎÉÅ ftp URL "
 "×ÍÅÓÔÏ"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr "   ÉÍÅÎ ÆÁÊÌÏ× Á ÔÁËÖÅ ÓÌÅÄÕÀİÉÅ ÏĞÃÉÉ:"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr "     --ftpproxy <ÁÄÒÅÓ>   "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <ĞÏÒÔ>    "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr "     --httpproxy <ÁÄÒÅÓ>  "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr "      --httpport <ĞÏÒÔ>    "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr "      ïĞÃÉÉ ÓĞÅÃÉÆÉËÁÃÉÉ ĞÁËÅÔÁ:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr "ÚÁĞÒÏÓÉÔØ/ĞÒÏ×ÅÒÉÔØ ×ÓÅ ĞÁËÅÔÙ"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr "        -f <ÆÁÊÌ>+        "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr "ÎÁÊÔÉ/ĞÒÏ×ÅÒÉÔØ ĞÁËÅÔ, ËÏÔÏÒÏÍÕ ĞÒÉÎÁÄÌÅÖÉÔ <ÆÁÊÌ>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr "        -p <ÆÁÊÌ ĞÁËÅÔÁ>+ "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "ÚÁĞÒÏÓÉÔØ/ĞÒÏ×ÅÒÉÔØ (ÎÅÕÓÔÁÎÏ×ÌÅÎÎÙÊ) ĞÁËÅÔ <ÆÁÊÌ ĞÁËÅÔÁ>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <ĞÁËÅÔ>"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr "ÚÁĞÒÏÓÉÔØ/ĞÒÏ×ÅÒÉÔØ ĞÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÁÍÉ ÎÁ ĞÁËÅÔ <ĞÁËÅÔ>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr "     --whatprovides <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr "ÎÁÊÔÉ/ĞÒÏ×ÅÒÉÔØ ĞÁËÅÔÙ, ĞÒÅÄÏÓÔÁ×ÌÑÀİÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr "     --whatrequires <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr "ÎÁÊÔÉ/ĞÒÏ×ÅÒÉÔØ ĞÁËÅÔÙ, ÔÒÅÂÕÀİÉÅ ÓÅÒ×ÉÓ <ÓÅÒ×ÉÓ>"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <qfmt>"
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr "      ïĞÃÉÉ ×ÙÂÏÒÁ ÉÎÆÏÒÍÁÃÉÉ:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr "ĞÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ĞÒÅÄÏÓÔÁ×ÌÑÅÍÙÅ ĞÁËÅÔÏÍ"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr "ĞÏËÁÚÁÔØ ÓÅÒ×ÉÓÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ĞÁËÅÔÁ"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr "×Ù×ÅÓÔÉ ÒÁÚÎÏÏÂÒÁÚÎÙÅ [ÄÅ]ÉÎÓÔÁÌÌÑÃÉÏÎÎÙÅ ÓËÒÉĞÔÙ"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr "ĞÏËÁÚÁÔØ ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÙ, ÓÏÄÅÒÖÁİÉÅÓÑ × ĞÁËÅÔÅ"
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁĞÏ×"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr "    --install <ÆÁÊÌ ĞÁËÅÔÁ>"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr "    -i <ÆÁÊÌ ĞÁËÅÔÁ>      "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <ĞÕÔØ>"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr "ĞÒÏĞÕÓÔÉÔØ ÆÁÊÌÙ × ĞÕÔÉ <ĞÕÔØ>"
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ËÁËÉÈ-ÌÉÂÏ ÕÓÔÁÎÏ×ÏŞÎÙÈ ÓËÒÉĞÔÏ×"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÏ×, ×Ú×ÅÄÅÎÎÙÈ ÎÁ ÜÔÏÔ ĞÁËÅÔ"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <ËÁÔÁÌÏÇ>  "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <oldpath>=<newpath>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <ÆÁÊÌ ĞÁËÅÔÁ>"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr "    -U <ÆÁÊÌ ĞÁËÅÔÁ>      "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr "    --erase <ĞÁËÅÔ>  "
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<stage> <spec>      "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr "    -t<stage> <tarball>   "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr "ÓÏÚÄÁÔØ ÔÏÌØËÏ src rpm"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr "     --buildroot <ËÁÔÁÌÏÇ>"
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr "     --target=<ĞÌÁÔÆÏÒÍÁ>+"
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr "   --rebuild <src_pkg>    "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr "   --recompile <src_pkg>  "
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
-msgstr "   --resign <ĞÁËÅÔ>+      "
+msgstr "   --resign <pkg>+      "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr "   --addsign <pkg>+       "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr "   --checksig <pkg>+"
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr "   -K <pkg>+             "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr "ÓÏÚÄÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ (ÎÅ ÏÂÑÚÁÔÅÌØÎÏ)"
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr "ĞÅÒÅÉÎÄÅËÓÉÒÏ×ÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "÷ÍÅÓÔÏ ÎÉÈ ÉÓĞÏÌØÚÕÊÔÅ -e ÉÌÉ --erase.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "ÏĞÃÉÑ --dbpath ÚÁÄÁÎÁ ÄÌÑ ÏĞÅÒÁÃÉÉ, ÎÅ ÉÓĞÏÌØÚÕÀİÅÊ ÂÁÚÕ ÄÁÎÎÙÈ"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
-"ÏĞÃÉÑ --justdb ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ ĞÁËÅÔÁ"
+"ÏĞÃÉÑ --notriggers ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ ÔÏÌØËÏ ĞÒÉ ÕÓÔÁÎÏ×ËÅ ÉÌÉ ÕÄÁÌÅÎÉÉ "
+"ĞÁËÅÔÁ"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ĞÅÒÅÓÂÏÒËÉ"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "ÎÅ ÚÁÄÁÎ spec-ÆÁÊÌ ÄÌÑ ÓÂÏÒËÉ ĞÁËÅÔÁ"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ĞÁËÅÔÁ"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ"
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
-msgstr "éÓĞÏÌÎÑÅÔÓÑ: %s\n"
+msgstr "÷ÙĞÏÌÎÑÅÔÓÑ(%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
-msgstr "éÓĞÏÌÎÉÔØ %s ÎÅ ÕÄÁÌÏÓØ (%s): %s"
+msgstr "÷ÙĞÏÌÎÉÔØ %s ÎÅ ÕÄÁÌÏÓØ (%s): %s"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr "îÅ×ÅÒÎÙÊ ËÏÄ ×ÏÚ×ÒÁÔÁ ÉÚ %s (%s)"
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ ĞÒÉ ÁÎÁÌÉÚÅ =="
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ ĞÒÉ ÁÎÁÌÉÚÅ &&"
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ ĞÒÉ ÁÎÁÌÉÚÅ ||"
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr "ÏÛÉÂËÁ ÁÎÁÌÉÚÁ ×ÙÒÁÖÅÎÉÑ"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr "ÎÅÚÁËÒÙÔÁÑ ("
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr "- ÔÏÌØËÏ ÄÌÑ ŞÉÓÅÌ"
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr "! ÔÏÌØËÏ ÄÌÑ ŞÉÓÅÌ"
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr "ÔÉĞÙ ÄÏÌÖÎÙ ÓÏ×ĞÁÄÁÔØ"
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr "* / ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÓÔÒÏË"
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr "- ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÄÌÑ ÓÔÒÏË"
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr "&& É || ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÄÌÑ ÓÔÒÏË"
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr "ÓÉÎÔÁËÓÉŞÅÓËÁÑ ÏÛÉÂËÁ × ×ÙÒÁÖÅÎÉÉ"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "ïÛÉÂËÁ TIMECHECK: %s\n"
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr "ïÔÓÕÔÓÔ×ÕÅÔ '(' × %s %s"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ')' × %s(%s"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr "îÅ×ÅÒÎÙÊ ÔÏËÅÎ %s: %s"
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr "îÅ ĞÒÏÂÅÌ ÓÌÅÄÕÅÔ ĞÏÓÌÅ %s(): %s"
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "îÅ×ÅÒÎÙÊ ÓÉÎÔÁËÓÉÓ: %s(%s)"
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "îÅ×ÅÒÎÙÅ ĞÒÁ×Á: %s(%s)"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr "îÅ×ÅÒÎÙÅ ĞÒÁ×Á ÎÁ ËÁÔÁÌÏÇ %s(%s)"
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr "îÅÏÂÙŞÎÁÑ ÄÌÉÎÁ locale: \"%.*s\" × %%lang(%s)"
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr "äÕÂÌÉËÁÔ locale %.*s × %%lang(%s)"
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
-msgstr "ìÉÍÉÔ ÄÌÑ %%docdir ĞÒÅ×ÚÏÊÄÅÎ"
+msgstr "ìÉÍÉÔ ÄÌÑ %%docdir ĞÒÅ×ÙÛÅÎ"
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr "ôÏÌØËÏ ÏÄÉÎ ÁÒÇÕÍÅÎÔ ÄÌÑ %%docdir"
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
-msgstr "ä×Á ÆÁÊÌÁ ÎÁ ÏÄÎÏÊ ÓÔÒÏËÅ: %s"
+msgstr "ä×Á ÆÁÊÌÁ × ÏÄÎÏÊ ÓÔÒÏËÅ: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁŞÉÎÁÔØÓÑ Ó \"/\": %s"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr "îÅÌØÚÑ ÓÍÅÛÉ×ÁÔØ ÓĞÅÃ. %%doc Ó ÄÒÕÇÉÍÉ ÆÏÒÍÁÍÉ: %s"
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr "æÁÊÌ ÕËÁÚÁÎ Ä×ÁÖÄÙ: %s"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr "óÉÍ×ÏÌÉŞÅÓËÁÑ ÓÓÙÌËÁ ÕËÁÚÙ×ÁÅÔ ÎÁ BuildRoot: %s -> %s"
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "æÁÊÌ ÎÅ ÓÏÏÔ×ÅÔÓÔÕÅÔ ĞÒÅÆÉËÓÕ (%s): %s"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "îÅ×ÅÒÎÁÑ ĞÁÒÁ ÈÏÚÑÉÎ/ÇÒÕĞĞÁ: %s\n"
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "æÁÊÌ %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁŞÉÎÁÔØÓÑ Ó \"/\": %s"
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s"
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files: %s"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "ÓÔÒÏËÁ: %s"
@@ -1774,21 +1734,21 @@ msgstr "ÓÔÒÏËÁ: %s"
 msgid "Bad file: %s: %s"
 msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
-msgstr "îÅ×ÅÒÎÁÑ ĞÁÒÁ ÈÏÚÑÉÎ/ÇÒÕĞĞÁ: %s"
+msgstr "îÅ×ÅÒÎÁÑ ĞÁÒÁ ×ÌÁÄÅÌÅÃ/ÇÒÕĞĞÁ: %s"
 
 #. XXX this error message is probably not seen.
 #: build/files.c:1638
 #, c-format
 msgid "Couldn't exec %s: %s"
-msgstr "îÅ ÍÏÇÕ ÉÓĞÏÌÎÉÔØ %s: %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s"
 
 #: build/files.c:1643
 #, c-format
 msgid "Couldn't fork %s: %s"
-msgstr "îÅ ÍÏÇÕ ÆÏÒËÎÕÔØ %s"
+msgstr "óÂÏÊ ×ÅÔ×ÌÅÎÉÑ %s: %s"
 
 #: build/files.c:1725
 #, c-format
@@ -1800,488 +1760,503 @@ msgstr "%s ÎÅ ÕÄÁÌÏÓØ"
 msgid "failed to write all data to %s"
 msgstr "ÚÁĞÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
-msgstr "ïĞÒÅÄÅÌÑÀÔÓÑ ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ...\n"
+msgstr "ğÏÉÓË %s (ÉÓĞÏÌØÚÕÑ %s): ...\n"
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s:"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀÔÓÑ ÆÁÊÌÙ: %s-%s-%s\n"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
-msgstr "îÅ ÍÏÇÕ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍĞØÀÔÅÒÁ: %s\n"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍĞØÀÔÅÒÁ: %s\n"
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á ÎÁ ÆÁÊÌÅ %s: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr "cpio_copy: ÏÛÉÂËÁ ÚÁĞÉÓÉ: %s"
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "cpio_copy: ÏÛÉÂËÁ ŞÔÅÎÉÑ: %s"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreIn: %s"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreUn: %s"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostIn: %s"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostUn: %s"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ VerifyScript: %s"
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Trigger script: %s"
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ŞÔÅÎÉÅ %s: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
-msgstr "readRPM: %s - ÎÅ ĞÁËÅÔ RPM\n"
+msgstr "readRPM: %s  ÎÅ Ñ×ÌÑÅÔÓÑ ĞÁËÅÔÏÍ RPM\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ŞÉÔÁÅÔÓÑ ÚÁÇÏÌÏ×ÏË ÉÚ %s\n"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA"
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ: %d\n"
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ: %s"
 
-#: build/pack.c:445
-#, c-format
-msgid "Generating signature: %d\n"
-msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ: %d\n"
-
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÃÅÌØ ĞÏÄĞÉÓÉ %s: %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌØ ĞÏÄĞÉÓÉ %s: %s"
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÃÅÌØ ĞÏÄĞÉÓÉ %s: %s"
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ĞÉËÔÏÇÒÁÍÍÕ %s: %s"
 
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
+#: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ %s: %s"
 
-#: build/pack.c:494
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ĞÉËÔÏÇÒÁÍÍÕ %s: %s"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ %s: %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĞÉÓÁÎ: %s\n"
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ĞÁËÅÔÁ %s: %s\n"
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr "ÓÔÒÏËÁ %d: ×ÔÏÒÏÅ %s"
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr "ÚÁĞÉÓÉ %%changelog ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó *"
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr "ÎÅĞÏÌÎÁÑ ÚÁĞÉÓØ %%changelog"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr "ÎÅ×ÅÒÎÁÑ ÄÁÔÁ × %%changelog: %s"
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr "%%changelog ÎÅ × ÎÉÓÈÏÄÑİÅÍ ÈÒÏÎÏÌÏÇÉŞÅÓËÏÍ ĞÏÒÑÄËÅ"
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr "ĞÒÏĞÕİÅÎÏ ÉÍÑ × %%changelog"
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr "ÎÅÔ ÏĞÉÓÁÎÉÑ × %%changelog"
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÁÎÁÌÉÚÁ %%description: %s"
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÁÑ ÏĞÃÉÑ %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr "ÓÔÒÏËÁ %d: óÌÉÛËÏÍ ÍÎÏÇÏ ÉÍÅÎ: %s"
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "ÓÔÒÏËÁ %d: ğÁËÅÔ ÎÅ ÓÕİÅÓÔ×ÕÅÔ: %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ ÏĞÉÓÁÎÉÅ"
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÒÁÚÂÏÒÁ %%files: %s"
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÊ ÓĞÉÓÏË %%files"
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr "áÒÈÉÔÅËÔÕÒÁ ÉÓËÌÀŞÅÎÁ: %s"
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr "áÒÈÉÔÅËÔÕÒÁ ÎÅ ×ËÌÀŞÅÎÁ: %s"
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr "ïó ÉÓËÌÀŞÅÎÁ: %s"
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr "ïó ÎÅ ×ËÌÀŞÅÎÁ: %s"
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr "ğÏÌÅ %s ÏÂÑÚÁÎÏ ĞÒÉÓÕÔÓÔ×Ï×ÁÔØ × ĞÁËÅÔÅ: %s"
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr "äÕÂÌÉÒÕÀİÉÅÓÑ ÚÁĞÉÓÉ %s × ĞÁËÅÔÅ: %s"
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ĞÉËÔÏÇÒÁÍÍÕ %s: %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ĞÉËÔÏÇÒÁÍÍÕ %s: %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉĞ ĞÉËÔÏÇÒÁÍÍÙ: %s"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
-msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÑÒÌÙËÁ: %s"
+msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÔÜÇ: %s"
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
-msgstr "ÓÔÒÏËÁ %d: ğÕÓÔÏÊ ÑÒÌÙË: %s"
+msgstr "ÓÔÒÏËÁ %d: ğÕÓÔÏÊ ÔÜÇ: %s"
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅÄÏĞÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ '-' × %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "BuildRoot ÎÅ ÍÏÖÅÔ ÂÙÔØ \"/\": %s"
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr "ÓÔÒÏËÁ %d: ğÒÅÆÉËÓ ÎÅ ÍÏÖÅÔ ÚÁËÁÎŞÉ×ÁÔØÓÑ ÎÁ \"/\": %s"
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "ÓÔÒÏËÁ %d: Docdir ÄÏÌÖÅÎ ÎÁŞÉÎÁÔØÓÑ Ó '/': %s"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "ÓÔÒÏËÁ %d: ğÏÌÅ Epoch/Serial ÄÏÌÖÎÏ ÂÙÔØ ŞÉÓÌÏÍ: %s"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ %s: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ BuildArchitecture: %s"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: îÅÉÚ×ÅÓÔÎÙÊ ÑÒÌÙË %d"
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ ĞÁËÅÔÁ: %s"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr "ğÁËÅÔ ÕÖÅ ÓÕİÅÓÔ×ÕÅÔ: %s"
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
-msgstr "ÓÔÒÏËÁ %d: îÅÉÚ×ÅÓÔÎÙÊ ÑÒÌÙË: %s"
+msgstr "ÓÔÒÏËÁ %d: îÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ: %s"
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr "æÁÊÌ spec ÎÅ ÍÏÖÅÔ ÉÓĞÏÌØÚÏ×ÁÔØ BuildRoot"
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr "îÅ×ÅÒÎÙÊ ÉÓÈÏÄÎÉË: %s: %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr "îÅÔ ÚÁĞÌÁÔÙ ÎÏÍÅÒ %d"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr "îÅÔ ÉÓÈÏÄÎÉËÁ ÎÏÍÅÒ %d"
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "îÅ ÍÏÇÕ ĞÏÌÕŞÉÔØ nosource %s: %s"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr "ïÛÉÂËÁ ÁÎÁÌÉÚÁ %%setup: %s"
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%setup %c: %s"
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÁÑ ÏĞÃÉÑ %%setup %s: %s"
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -b ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s"
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -z ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s"
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "ÓÔÒÏËÁ %d: äÌÑ %%patch -p ÎÕÖÅÎ ÁÒÇÕÍÅÎÔ: %s"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch -p: %s"
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÚÁĞÌÁÔ!"
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %%patch: %s"
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr "ÓÔÒÏËÁ %d: ×ÔÏÒÏÊ %%prep"
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
-"ÓÔÒÏËÁ %d: %s: ôÏËÅÎÙ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó ÂÕË×Ù, ÃÉÆÒÙ, '_' ÉÌÉ "
+"ÓÔÒÏËÁ %d: ôÏËÅÎÙ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó ÂÕË×Ù, ÃÉÆÒÙ, '_' ÉÌÉ "
 "'/': %s"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "ÓÔÒÏËÁ %d: éÍÅÎÁ ÆÁÊÌÏ× ÎÅ ÒÁÚÒÅÛÁÀÔÓÑ: %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "ÓÔÒÏËÁ %d: ÷ÅÒÓÉÉ × ÉÍÅÎÁÈ ÆÁÊÌÏ× ÎÅÄÏĞÕÓÔÉÍÙ: %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr "ÓÔÒÏËÁ %d: ôÒÅÂÕÅÔÓÑ ×ÅÒÓÉÑ: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr "ÓÔÒÏËÁ %d: ÔÒÉÇÇÅÒÙ ÄÏÌÖÎÙ ÓÏÄÅÒÖÁÔØ --: %s"
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÁÎÁÌÉÚÁ %s: %s"
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr "ÓÔÒÏËÁ %d: ğÒÏÇÒÁÍÍÙ × ÓËÒÉĞÔÁÈ ÄÏÌÖÎÙ ÎÁŞÉÎÁÔØÓÑ Ó '/': %s"
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÅ %s"
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr "ÓÔÒÏËÁ %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr "îÅÚÁËÒÙÔÙÊ %%if"
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s:%d: parseExpressionBoolean ËÏÄ ×ÏÚ×ÒÁÔÁ: %d"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: îÁÊÄÅÎ %%else ÂÅÚ %%if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: îÁÊÄÅÎ %%endif ÂÅÚ %%if"
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÂßÑ×ÌÅÎÉÅ %%include"
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
-msgstr "îÅÔ ÁÒÈÉÔÅËÔÕÒ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ĞÏÓÔÒÏÉÔØ"
+msgstr "îÅÔ ÁÒÈÉÔÅËÔÕÒ, ÄÌÑ ËÏÔÏÒÙÈ ×ÏÚÍÏÖÎÁ ÓÂÏÒËÁ"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr "ğÁËÅÔ ÎÅ ÉÍÅÅÔ %%description: %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr "ÁÒÈÉ× = %s, fs = %s\n"
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ: %s"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ no%s: %d"
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ %s: %s\n"
@@ -2289,271 +2264,274 @@ msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÏÅ ŞÉÓÌÏ %s: %s\n"
 #: lib/cpio.c:444
 #, c-format
 msgid "can't rename %s to %s: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ĞÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÅÒÅÉÍÅÎÏ×ÁÔØ %s × %s: %s\n"
 
 #: lib/cpio.c:450
 #, c-format
 msgid "can't unlink %s: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ %s: %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÓÓÙÌËÕ %s: %s\n"
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(ÏÛÉÂËÁ 0x%x)"
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr "îÅ×ÅÒÎÙÊ magic"
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr "îÅ×ÅÒÎÙÊ/ÎÅŞÉÔÁÅÍÙÊ ÚÁÇÏÌÏ×ÏË"
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË"
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉĞ ÆÁÊÌÁ"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÖÅÓÔËÁÑ ÓÓÙÌËÁ"
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ"
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr "ÎÅ ÕÄÁÌÏÓØ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
+"ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n"
+"\tA %s\tB %s\n"
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
-msgstr ""
+msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
-msgstr ""
+msgstr "%s: %-45s YES (added files)\n"
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
+msgstr "%s: %-45s YES (added provide)\n"
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+msgstr "%s: %-45s %-3s (cached)\n"
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
-msgstr ""
+msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr ""
+msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
-msgstr ""
+msgstr "%s: %-45s YES (db files)\n"
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
-msgstr ""
+msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
-msgstr ""
+msgstr "%s: %-45s NO\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
-msgstr ""
+msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ĞÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
-msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕĞĞ\n"
+msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr "db%d ÏÛÉÂËÁ(%d)"
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr " ÉÓĞÏÌÎÑÅÔÓÑ %s"
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr "ÚÁËÒÙÔ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
-msgstr "ÕÄẠ́ΠÆÁÊÌ ÂÁÚÕ ÄÁÎÎÙÈ %s\n"
+msgstr "ÕÄẠ́ΠÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "ÏÔËÒÙ×ÅÔÓÑ ÆÁÊÌ %s ÂÁÚÙ ÄÁÎÎÙÈ × ÒÅÖÉÍÅ 0x%x\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
-msgstr "ÎÅ ÍÏÇÕ ĞÏÌÕŞÉÔØ %s ÄÏÓÔÕĞ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÏÌÕŞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÂÁÚÙ ÄÁÎÎÙÈ"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "ÉÓËÌÀŞÉÔÅÌØÎÙÊ"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
 #: lib/db2.c:137
 #, c-format
 msgid "closed  db environment %s/%s(%s)\n"
-msgstr ""
+msgstr "ÚÁËÒÙÔÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s(%s)\n"
 
 #: lib/db2.c:149
 #, c-format
 msgid "removed db environment %s/%s(%s)\n"
-msgstr ""
+msgstr "ÕÄÁÌÅÎÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s(%s)\n"
 
 #: lib/db2.c:186
 #, c-format
 msgid "opening db environment %s/%s(%s) %s\n"
-msgstr ""
+msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s(%s) %s\n"
 
 #: lib/db2.c:561
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
-msgstr ""
+msgstr "ÚÁËÒÙÔ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s(%s)\n"
 
 #: lib/db2.c:639
 #, c-format
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
-msgstr ""
+msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s(%s) %s mode=0x%x\n"
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
-msgstr ""
+msgstr "dbiSetConfig: ÎÅÏĞÏÚÎÁÎÎÁÑ ÏĞÃÉÑ ÂÁÚÙ ÄÁÎÎÙÈ: \"%s\" ĞÒÏÉÇÎÏÒÉÒÏ×ÁÎÁ\n"
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
-msgstr ""
+msgstr "%s ÉÍÅÅÔ ÎÅ×ÅÒÎÕÀ ŞÉÓÌÏ×ÕÀ ×ÅÌÉŞÉÎÕ, ĞÒÏĞÕİÅÎÏ\n"
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
-msgstr ""
+msgstr "%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉŞÉÎÕ long, ĞÒÏĞÕİÅÎÏ\n"
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
+"%s ÉÍÅÅÔ ÓÌÉÛËÏÍ ÍÁÌÕÀ ÉÌÉ ÓÌÉÛËÏÍ ÂÏÌØÛÕÀ ×ÅÌÉŞÉÎÕ integer, ĞÒÏĞÕİÅÎÏ\n"
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
-msgstr ""
+msgstr "ÚÁËÒÙÔÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
-msgstr ""
+msgstr "ÕÄÁÌÅÎÏ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
-msgstr ""
+msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÏËÒÕÖÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s\n"
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
-msgstr ""
+msgstr "ÚÁËÒÙÔ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
-msgstr ""
+msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÏÌÕŞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
-msgstr ""
+msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"
 
 #: lib/falloc.c:140
 #, c-format
@@ -2564,127 +2542,118 @@ msgid ""
 "rpm-list@redhat.com mailing list\n"
 "if \"rpm --rebuilddb\" fails to correct the problem.\n"
 msgstr ""
+"ĞÏ×ÒÅÖÄÅÎ ÓĞÉÓÏË Ó×ÏÂÏÄÎÙÈ ÚÁĞÉÓÅÊ (%u) - ĞÏÖÁÌÕÊÓÔÁ ÚÁĞÕÓÔÉÔÅ\n"
+"\t\"rpm --rebuilddb\"\n"
+"âÏÌÅÅ ĞÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÄÏÓÔÕĞÎÁ ÎÁ http://www.rpm.org ÉÌÉ × ÓĞÉÓËÅ "
+"ÒÁÓÓÙÌËÉ rpm-list@redhat.com\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(ÎÅ ŞÉÓÌÏ)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
-msgstr "mntctl() ÎÅ ×ÏÚ×ÒÁÔÉÌ ÒÁÚÍÅÒÁ fugger(??): %s"
+msgstr "mntctl() ÎÅ ×ÏÚ×ÒÁÔÉÌ ÚÎÁŞÅÎÉÅ ÒÁÚÍÅÒÁ fugger: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
-msgstr "ÎÅ ÍÏÇÕ ĞÏÌÕŞÉÔØ ÉÎÆÏÒÍÁÃÉÀ ÏÂ %s: %s"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÏÌÕŞÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï %s: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
-msgstr ""
+msgstr "ĞÏÌÕŞÅÎÉÅ ÓĞÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n"
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr "ÆÁÊÌ %s - ÎÁ ÎÅÉÚ×ÅÓÔÎÏÍ ÕÓÔÒÏÊÓÔ×Å"
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
+#, fuzzy
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉĞ ÄÁÎÎÙÈ %d ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "îÅ×ÅÒÎÏÅ ŞÉÓÌÏ ÄÌÑ headerAddEntry(): %d\n"
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ĞÏÓÌÅ \"%\""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ĞÏÓÌÅ \"%{\""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "ĞÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "ĞÕÓÔÏÅ ÉÍÑ ÔÜÇÁ"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
-msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÓÑ \"?\""
+msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"?\""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
-msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \"?\" ÏÖÉÄÁÌÁÓØ \"{\""
+msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \"{\""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
-msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÁÓØ \"}\""
+msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÏÓØ \"}\""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
-msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \":\" ÏÖÉÄÁÌÁÓØ \"{\""
+msgstr "× ×ÙÒÁÖÅÎÉÉ ĞÏÓÌÅ \":\" ÏÖÉÄÁÌÏÓØ \"{\""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉĞ)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "ÆÁÊÌ : %s ÄÅÊÓÔ×ÉÅ: %s\n"
@@ -2692,560 +2661,559 @@ msgstr "ÆÁÊÌ : %s ÄÅÊÓÔ×ÉÅ: %s\n"
 #: lib/install.c:214
 #, c-format
 msgid "user %s does not exist - using root"
-msgstr "ĞÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ, ÉÓĞÏÌØÚÕÀ root"
+msgstr "ĞÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ, ÉÓĞÏÌØÚÕÅÔÓÑ root"
 
 #: lib/install.c:222
 #, c-format
 msgid "group %s does not exist - using root"
-msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ, ÉÓĞÏÌØÚÕÀ root"
+msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ, ÉÓĞÏÌØÚÕÅÔÓÑ root"
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
-msgstr "ÚÎÁŞÅÎÉÅ %%instchangelog × ÍÁËÒÏÆÁÊÌÅ ÄÏÌÖÎÏ ÂÙÔØ ŞÉÓÌÏÍ, Á ÏÎÏ ÎÅÔ..."
+msgstr "ÚÎÁŞÅÎÉÅ %%instchangelog × ÍÁËÒÏÆÁÊÌÅ ÄÏÌÖÎÏ ÂÙÔØ ŞÉÓÌÏÍ"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s"
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
-msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ\n"
+msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ\n"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
-msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ sourcedir %s"
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
-msgstr "ÎÅ ÍÏÇÕ ĞÉÓÁÔØ × %s"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÉÓÁÔØ × %s"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr "ÉÓÈÏÄÎÉËÉ ×: %s\n"
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
-msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ specdir %s"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "ÆÁÊÌ spec ×: %s\n"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "ĞÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "ÏÛÉÂËÁ ĞÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
-msgstr "ÏÖÉÄÁÌÓÑ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ, ÎÁÊÄÅÎ ÂÉÎÁÒÎÙÊ"
+msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ"
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "ĞÁËÅÔ: %s-%s-%s ÆÁÊÌÏ×; test = %d\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
-msgstr "ÏÓÔÁÎÁ×ÌÉ×ÁÀ ÕÓÔÁÎÏ×ËÕ, Ô.Ë. ÍÙ ÉÓĞÏÌÎÑÅÍ --test\n"
+msgstr "ÕÓÔÁÎÏ×ËÁ ĞÒÅËÒÁİÁÅÔÓÑ, Ô.Ë. ÍÙ ÉÓĞÏÌÎÑÅÍ --test\n"
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
-msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n"
+msgstr "ÉÓĞÏÌÎÑÅÔÓÑ ÓËÒÉĞÔ preinstall (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
-msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s"
+msgstr "×ÎÉÍÁÎÉÅ: %s ÓÏÚÄÁÎ ËÁË %s"
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
-msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s"
+msgstr "×ÎÉÍÁÎÉÅ: %s ÓÏÈÒÁÎÅÎ ËÁË %s"
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
-msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n"
+msgstr "×ÙĞÏÌÎÑÅÔÓÑ ÓËÒÉĞÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
-msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 3"
+msgstr "ĞÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM"
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
-msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 3"
+msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
-msgstr "buildroot ÕÖÅ ÚÁÄÁÎ"
+msgstr "buildroot ÕÖÅ ÕËÁÚÁÎ"
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
-msgstr ""
+msgstr "×ÙĞÏÌÎÉÔØ ĞÏ ÓÔÁÄÉÀ %%prep ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
-msgstr ""
+msgstr "×ÙĞÏÌÎÉÔØ ĞÏ ÓÔÁÄÉÀ %%build ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
-msgstr ""
+msgstr "×ÙĞÏÌÎÉÔØ ĞÏ ÓÔÁÄÉÀ %%install ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
-msgstr "ĞÏÄÓÔÁ×ÉÔØ ÓÅËÃÉÉ i18n ÉÚ ÓÌÅÄÕÀİÅÇÏ ËÁÔÁÌÏÇÁ"
+msgstr "ĞÒÏ×ÅÒÉÔØ ÒÁÚÄÅÌ %%files ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
-msgstr ""
+msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ É Ä×ÏÉŞÎÙÊ ĞÁËÅÔÙ ĞÏ ÆÁÊÌÕ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
-msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec"
+msgstr "ÓÏÂÒÁÔØ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ĞÏ ÆÁÊÌÕ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
-msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ .spec"
+msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ĞÏ ÆÁÊÌÕ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
-msgstr ""
+msgstr "×ÙĞÏÌÎÉÔØ ĞÏ ÓÔÁÄÉÀ %%prep ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
-msgstr ""
+msgstr "×ÙĞÏÌÎÉÔØ ĞÏ ÓÔÁÄÉÀ %%build ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
-msgstr ""
+msgstr "×ÙĞÏÌÎÉÔØ ĞÏ ÓÔÁÄÉÀ %%install ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
-msgstr ""
+msgstr "ĞÒÏ×ÅÒÉÔØ ÓÅËÃÉÀ %%files ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
-msgstr ""
+msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ É Ä×ÏÉŞÎÙÊ ĞÁËÅÔÙ ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
-msgstr ""
+msgstr "ÓÏÂÒÁÔØ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
-msgstr ""
+msgstr "ÓÏÂÒÁÔØ ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
-msgstr "binary package (ÉÓĞÏÌÎÉÔØ %prep, %build, %install É ÓÏÚÄÁÔØ RPM)"
+msgstr "ÓÏÂÒÁÔØ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ÉÚ ÉÓÈÏÄÎÏÇÏ ĞÁËÅÔÁ"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
-msgstr ""
+msgstr "×ÙĞÏÌÎÉÔØ ĞÏ ÓÔÁÄÉÀ %%install ÉÚ ÁÒÈÉ×Á tar"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr "ĞÅÒÅÏĞÒÅÄÅÌÉÔØ build root"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
-msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁĞÏ× ÓÂÏÒËÉ"
+msgstr "ÎÅ ×ÙĞÏÌÎÑÔØ ÎÉËÁËÉÈ ÜÔÁĞÏ× ÓÂÏÒËÉ"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "ÎÅ ĞÒÉÎÉÍÁÔØ ÓÔÒÏË I18N ÉÚ spec-ÆÁÊÌÁ"
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
-msgstr "ĞÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ spec-ÆÁÊÌ"
+msgstr "ĞÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÕÄÁÌÉÔØ ÆÁÊÌ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr "ĞÅÒÅÏĞÒÅÄÅÌÉÔØ ÃÅÌÅ×ÕÀ ĞÌÁÔÆÏÒÍÕ"
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
-msgstr "ÉÓËÁÔØ ÓÔÒÏËÉ I18N × ËÁÔÁÌÏÇÅ ÓÏ spec-ÆÁÊÌÏÍ"
+msgstr "ÉÓËÁÔØ ÓÔÒÏËÉ I18N × ËÁÔÁÌÏÇÅ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
-msgstr "ÎÁÊÔÉ ĞÁËÅÔ, ËÏÔÏÒÏÍÕ ĞÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ"
+msgstr "ÚÁĞÒÏÓÉÔØ/ĞÒÏ×ÅÒÉÔØ ĞÁËÅÔ, ËÏÔÏÒÏÍÕ ĞÒÉÎÁÄÌÅÖÉÔ ÆÁÊÌ"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
-msgstr "ÚÁĞÒÏÓ ĞÁËÅÔÏ× × ÇÒÕĞĞÅ"
+msgstr "ÚÁĞÒÏÓÉÔØ/ĞÒÏ×ÅÒÉÔØ ĞÁËÅÔÙ × ÇÒÕĞĞÅ"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
-msgstr "ÚÁĞÒÏÓÉÔØ ÆÁÊÌ ĞÁËÅÔÁ"
+msgstr "ÚÁĞÒÏÓÉÔØ/ĞÒÏ×ÅÒÉÔØ ÆÁÊÌ ĞÁËÅÔÁ"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
-msgstr "ÒÅÖÉÍ ÚÁĞÒÏÓÁ"
+msgstr "ÒÅÖÉÍ ÚÁĞÒÏÓÁ rpm"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
-msgstr ""
+msgstr "ÏÔÏÂÒÁÚÉÔØ ÉÚ×ÅÓÔÎÙÅ ËÌÀŞÉ ÚÁĞÒÏÓÁ"
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
-msgstr "ÚÁĞÒÏÓÉÔØ spec-ÆÁÊÌ"
+msgstr "ÚÁĞÒÏÓÉÔØ ÆÁÊÌ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr "ÚÁĞÒÏÓÉÔØ ĞÁËÅÔÙ Ó ÔÒÉÇÇÅÒ-ÓËÒÉĞÔÁÍÉ ÎÁ ĞÁËÅÔ"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
-msgstr "ÒÅÖÉÍ ÚÁĞÒÏÓÁ"
+msgstr "ÒÅÖÉÍ ĞÒÏ×ÅÒËÉ rpm"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
-msgstr ""
+msgstr "ÒÅÖÉÍ ĞÒÏ×ÅÒËÉ rpm (ÓÔÁÒÙÊ)"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
-msgstr "ÎÁÊÔÉ ĞÁËÅÔÙ, ÔÒÅÂÕÀİÉÅ ÓÅÒ×ÉÓÁ"
+msgstr "ÚÁĞÒÏÓÉÔØ ĞÁËÅÔÙ, ÔÒÅÂÕÀİÉÅ ÓÅÒ×ÉÓ"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
-msgstr "ÎÁÊÔÉ ĞÁËÅÔÙ, ĞÒÅÄÏÓÔÁ×ÌÑÀİÉÅ ÓÅÒ×ÉÓ"
+msgstr "ÚÁĞÒÏÓÉÔØ ĞÁËÅÔÙ, ĞÒÅÄÏÓÔÁ×ÌÑÀİÉÅ ÓÅÒ×ÉÓ"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
-msgstr "ĞÏËÁÚÁÔØ ×ÓÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ"
+msgstr "ĞÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ËÏÎÆÉÇÕÒÁÃÉÉ"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr "ĞÏËÁÚÁÔØ ×ÓÅ ÆÁÊÌÙ ÄÏËÕÍÅÎÔÁÃÉÉ"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
-msgstr "×Ù×ÅÓÔÉ ÂÁÚÏ×ÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ"
+msgstr "ĞÏËÁÚÁÔØ ÏÓÎÏ×ÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÆÁÊÌÅ"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
-msgstr "ĞÏËÁÚÁÔØ ÆÁÊÌÙ ĞÁËÅÔÁ"
+msgstr "ĞÏËÁÚÁÔØ ÓĞÉÓÏË ÆÁÊÌÏ× ĞÁËÅÔÁ"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
-msgstr "ÉÓĞ. ÓÌÅÄÕÀİÉÊ ÆÏÒÍÁÔ ÚÁĞÒÏÓÁ"
+msgstr "ÉÓĞÏÌØÚÕÊÔÅ ÓÌÅÄÕÀİÉÊ ÆÏÒÍÁÔ ÚÁĞÒÏÓÁ"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
-msgstr "ĞÏÄÓÔÁ×ÉÔØ ÓÅËÃÉÉ i18n ÉÚ ÓÌÅÄÕÀİÅÇÏ ËÁÔÁÌÏÇÁ"
+msgstr "ÚÁÍÅÎÉÔØ ÓÅËÃÉÉ i18n × ÆÁÊÌÅ ÓĞÅÃÉÆÉËÁÃÉÉ"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
-msgstr "ĞÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ĞÏËÁÚÁÎÎÙÈ ÆÁÊÌÏ×"
+msgstr "ĞÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ĞÅÒÅŞÉÓÌÅÎÎÙÈ ÆÁÊÌÏ×"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
-msgstr "×Ù×ÅÓÔÉ ÄÅÔÁÌØÎÙÊ ÓĞÉÓÏË ÆÁÊÌÏ× ĞÁËÅÔÁ"
+msgstr "ĞÏËÁÚÁÔØ ÄÅÔÁÌØÎÙÊ ÓĞÉÓÏË ÆÁÊÌÏ×"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n"
 
-#: lib/problems.c:103
-#, c-format
-msgid "package %s-%s-%s is for a different architecture"
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
 msgstr "ĞÁËÅÔ %s-%s-%s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ"
 
-#: lib/problems.c:108
-#, c-format
-msgid "package %s-%s-%s is for a different operating system"
-msgstr "ĞÁËÅÔ %s-%s-%s - ÄÌÑ ÄÒÕÇÏÊ ïó"
+#: lib/problems.c:103
+#, fuzzy, c-format
+msgid "package %s is for a different operating system"
+msgstr "ĞÁËÅÔ %s-%s-%s - ÄÌÑ ÄÒÕÇÏÊ ÏĞÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ"
 
-#: lib/problems.c:113
-#, c-format
-msgid "package %s-%s-%s is already installed"
+#: lib/problems.c:107
+#, fuzzy, c-format
+msgid "package %s is already installed"
 msgstr "ĞÁËÅÔ %s-%s-%s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/problems.c:118
-#, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
-msgstr "ĞÕÔØ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ ÄÌÑ ĞÁËÅÔÁ %s-%s-%s"
+#: lib/problems.c:111
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "ĞÁËÅÔ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ\n"
 
-#: lib/problems.c:123
-#, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+#: lib/problems.c:116
+#, fuzzy, c-format
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ĞÒÉ ĞÏĞÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s-%s-%s É %s-%s-%s"
 
-#: lib/problems.c:129
-#, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+#: lib/problems.c:121
+#, fuzzy, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "ÆÁÊÌ %s ÉÚ ĞÁËÅÔÁ %s-%s-%s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ĞÁËÅÔÁ %s-%s-%s"
 
-#: lib/problems.c:135
-#, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+#: lib/problems.c:126
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "ĞÁËÅÔ %s-%s-%s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ŞÅÍ %s-%s-%s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/problems.c:141
-#, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
-msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s-%s-%s ÎÕÖÎÏ %ld%c ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
+#: lib/problems.c:131
+#, fuzzy, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
+msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s-%s-%s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, fuzzy, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
-msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s-%s-%s ÎÕÖÎÏ %ld%c ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ĞÁËÅÔÁ %s-%s-%s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
 
-#: lib/problems.c:158
-#, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
-msgstr ""
+#: lib/problems.c:146
+#, fuzzy, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
+msgstr "pre-transaction syscall(s) ĞÁËÅÔ %s-%s-%s: ÓÂÏÊ %s: %s"
 
-#: lib/problems.c:166
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+#: lib/problems.c:153
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ĞÒÉ ÒÁÂÏÔÅ Ó ĞÁËÅÔÏÍ %s-%s-%s"
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr "ÎÏÒÍÁÌØÎÙÊ    "
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr "ÚÁÍÅÎÅÎÎÙÊ    "
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ "
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr "ÓÅÔÅ×ÏÊ       "
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ÎÅÉÚ×. %3d)  "
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr "(ÓÏÓÔ. ÎÅÔ)   "
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr "ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓĞÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID"
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ %s: %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÒÏÓÉÔØ %s: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
-msgstr "ÏÔËÒÙÔÉÅ %s ÎÅ ÕÄÁÌÏÓØ\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "ÚÁĞÒÏÓÙ Ë SRPM × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ÎÅ ĞÏÈÏÖ ÎÁ ĞÁËÅÔ RPM...\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "ÏÛÉÂËÁ ÚÁĞÒÏÓÁ %s\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
-msgstr "ÚÁĞÒÏÓ spec-ÆÁÊÌÁ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ ÍÏÇÕ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n"
+msgstr "ÚÁĞÒÏÓ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
-msgstr "ÎÁÊÄÅÎÏ %d ĞÁËÅÔÏ×\n"
+msgstr "ÎÅÔ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ĞÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ÆÁÊÌ %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ĞÁËÅÔÁ: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
-msgstr "ÚÁĞÉÓØ ĞÁËÅÔÁ ÎÏÍÅÒ %d\n"
+msgstr "ÎÏÍÅÒ ÚÁĞÉÓÉ ĞÁËÅÔÁ: %u\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "ÚÁĞÉÓØ %d ÎÅ ŞÉÔÁÅÔÓÑ\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
-msgstr "%s: ïÛÉÂËÁ ÏÔËÒÙÔÉÑ\n"
+msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
-msgstr "ÚÁĞÕÓË ÎÅ ÕÄÁÌÓÑ\n"
+msgstr "ÏÛÉÂËÁ makeTempFile\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
-msgstr "%s: ÏÛÉÂËÁ readLead\n"
+msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
-msgstr "%s: ÏÛÉÂËÁ readLead\n"
+msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÏÄĞÉÓÁÔØ RPM v1.0\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÅÒÅĞÏÄĞÉÓÁÔØ RPM v2.0\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
-msgstr "%s: ğÏÄĞÉÓÉ ÎÅÔ\n"
+msgstr "%s: ğÏÄĞÉÓØ ÎÅÄÏÓÔÕĞÎÁ\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
-msgstr "%s: ÏÛÉÂËÁ readLead\n"
+msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
-msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
+msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: ğÏÄĞÉÓÉ ÎÅÔ (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
-msgstr "îå Ok"
+msgstr "îå Oë"
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr " (ïôóõôóô÷õàô ëìàşé:"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
-msgstr " ("
+msgstr " (îåô äï÷åòéñ ë ëìàşáí:"
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
-msgstr "Ok"
+msgstr "Oë"
 
 #: lib/rpmdb.c:101
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
-msgstr ""
+msgstr "dbiTagsInit: ÉÍÑ ËÌÀŞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
 
 #: lib/rpmdb.c:264
 msgid ""
@@ -3255,16 +3223,22 @@ msgid ""
 "    and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
 "\n"
 msgstr ""
+"\n"
+"--> üÔÁ ×ÅÒÓÉÑ RPM ÎÅ ÂÙÌÁ ÓÏÂÒÁÎÁ Ó ĞÏÄÄÅÒÖËÏÊ ÄÌÑ \"%%_dbapi %d\".\n"
+"    éÓĞÏÌØÚÕÑ \"rpm --showrc\" ĞÒÏ×ÅÒØÔÅ ÚÎÁŞÅÎÉÑ ÍÁËÒÏÓÁ %%_dbapi É\n"
+"    ÏĞÒÅÄÅÌÉÔÅ \"%%_dbapi 3\" (Ô.Å. ÓÏÚÄÁÊÔÅ ÉÌÉ ĞÏĞÒÁ×ØÔÅ "
+"/etc/rpm/macros).\n"
+"\n"
 
 #: lib/rpmdb.c:279
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÎÁ %s:%d"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓĞÏÌØÚÕÑ db%d - %s (%d)"
 
 #: lib/rpmdb.c:299
 #, c-format
 msgid "cannot open %s index"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s"
 
 #: lib/rpmdb.c:314
 #, c-format
@@ -3275,6 +3249,11 @@ msgid ""
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
+"\n"
+"--> îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ RPM × ÆÏÒÍÁÔÅ db%d.\n"
+"    åÓÌÉ ĞÁËÅÔ RPM ÂÙÌ ÏÂÎÏ×ÌÅÎ, ÎÅÏÂÈÏÄÉÍÏ ĞÅÒÅÉÎÄÅËÓÉÒÏ×ÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ\n"
+"    × ÆÏÒÍÁÔ db%d, ÚÁĞÕÓÔÉ× \"rpm --rebuilddb\" ËÁË root\n"
+"\n"
 
 #: lib/rpmdb.c:327
 msgid ""
@@ -3285,6 +3264,12 @@ msgid ""
 "/etc/rpm/macros).\n"
 "\n"
 msgstr ""
+"\n"
+"--> âÁÚÁ ÄÁÎÎÙÈ db%d ÕËÁÚÁÎÁ × ÍÁËÒÏÓÅ %%_dbapi, ÎÏ ÏÂÎÁÒÕÖÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ\n"
+"    × ÆÏÒÍÁÔÅ db%d. ğÒÏ×ÅÒØÔÅ ÚÎÁŞÅÎÉÅ ÍÁËÒÏÓÁ %%_dbapi, ÉÓĞÏÌØÚÕÑ\n"
+"    \"rpm --showrc\" É ÕËÁÖÉÔÅ \"%%_dbapi %d\" (Ô.Å. ÓÏÚÄÁÊÔÅ É/ÉÌÉ\n"
+"    ĞÏĞÒÁ×ØÔÅ /etc/rpm/macros).\n"
+"\n"
 
 #: lib/rpmdb.c:342
 msgid ""
@@ -3296,25 +3281,33 @@ msgid ""
 "    \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
 "\n"
 msgstr ""
+"\n"
+"--> ïÂÎÁÒÕÖÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ RPM × ÆÏÒÍÁÔÅ db%d. òÅËÏÍÅÎÄÕÅÍÙÊ ÆÏÒÍÁÔ - db%d.\n"
+"    éÓĞÏÌØÚÕÑ \"rpm --showrc\" ĞÒÏ×ÅÒØÔÅ ÚÎÁŞÅÎÉÑ ÍÁËÒÏÓÏ×\n"
+"    %%_dbapi É %%_dbapi_rebuild\n"
+", ÚÁÔÅÍ ÚÁĞÕÓÔÉÔÅ \"rpm --rebuilddb\"\n"
+"    ËÁË root ÉÌÉ ÏĞÒÅÄÅÌÉÔÅ \"%%_dbapi_rebuild %d\"\n"
+"    × ÆÁÊÌÅ /etc/rpm/macros).\n"
+"\n"
 
 #: lib/rpmdb.c:410
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
-msgstr "ÏÛÉÂËÁ ĞÏÌÕŞÅÎÉÑ ÚÁĞÉÓÉ %s ÉÚ %s"
+msgstr "ÏÛÉÂËÁ(%d) ĞÏÌÕŞÅÎÉÑ ÚÁĞÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s"
 
 #: lib/rpmdb.c:528
 #, c-format
 msgid "error(%d) storing record %s into %s"
-msgstr "ÏÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁĞÉÓÉ %s × %s"
+msgstr "ÏÛÉÂËÁ(%d) ÚÁĞÉÓÉ ÚÁĞÉÓÉ %s × %s"
 
 #: lib/rpmdb.c:537
 #, c-format
 msgid "error(%d) removing record %s from %s"
-msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁĞÉÓÉ %s ÉÚ %s"
+msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁĞÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
-msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath"
+msgstr "ĞÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
 #: lib/rpmdb.c:871
 msgid ""
@@ -3322,521 +3315,519 @@ msgid ""
 "database"
 msgstr ""
 "ÎÁÊÄÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ ÓÔÁÒÏÇÏ ÆÏÒÍÁÔÁ; ÉÓĞÏÌØÚÕÊÔÅ --rebuilddb ÄÌÑ ÇÅÎÅÒÁÃÉÉ "
-"ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ"
+"ÂÁÚÙ ÄÁÎÎÙÈ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ"
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
-msgstr ""
+msgstr "ÏÛÉÂËÁ(%d) ĞÒÉ ĞÏÄÓŞ£ÔÅ ĞÁËÅÔÏ×"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
-msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ĞÏÉÓËÁ"
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
-msgstr "ÕÄÁÌÑÀ ÚÁĞÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
+msgstr "ÕÄÁÌÑÅÔÓÑ 0 ÚÁĞÉÓÅÊ %s.\n"
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
-msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕĞĞ\n"
+msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
-msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n"
+msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁĞÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
-msgstr ""
+msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ĞÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ĞÁËÅÔÁ"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
-msgstr ""
+msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ 0 ÚÁĞÉÓÅÊ %s.\n"
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
-msgstr "ĞÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
+msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n"
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
-msgstr ""
+msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁĞÉÓÅÊ × ÉÎÄÅËÓ %s\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
-msgstr "ĞÅÒÅÓÔÒÁÉ×ÁÀ ÂÁÚÕ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ %s\n"
+msgstr "ĞÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕİÅÓÔ×ÕÅÔ"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
-msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
+msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
-msgstr "ÏÔËÒÙ×ÁÀ ÓÔÁÒÕÀ ÂÁÚÕ\n"
+msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ŞÅÒÅÚ dbapi %d\n"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
-msgstr "ÏÔËÒÙ×ÁÀ ÎÏ×ÕÀ ÂÁÚÕ\n"
+msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ŞÅÒÅÚ dbapi %d\n"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
-msgstr "ÚÁĞÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÎÅ×ÅÒÎÁ, ĞÒÏĞÕÓËÁÀ"
+msgstr "ÚÁĞÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ĞÒÏĞÕÓËÁÅÔÓÑ."
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
-msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÚÁĞÉÓØ (ĞÅÒ×ÏÎÁŞÁÌØÎÏ × %d)"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁĞÉÓØ (ĞÅÒ×ÏÎÁŞÁÌØÎÏ × %d)"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
-msgstr "ĞÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
+msgstr ""
+"ĞÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
-msgstr "ÚÁÍÅÎÁ ÓÔÁÒÏÊ ÂÁÚÙ ÎÁ ÎÏ×ÕÀ ÎÅ ÕÄÁÌÁÓØ!\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n"
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
-msgstr "ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÚÁÍÅÎÑÅÔ ÆÁÊÌÙ × %s ÆÁÊÌÁÍÉ ÉÚ %s"
+msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
-msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
+msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
-msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n"
+msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
-msgstr "ÓŞÉÔÁÀ ĞÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ\n"
+msgstr "ĞÏÄÓŞÉÔÙ×ÁÀÔÓÑ ĞÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ\n"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "ÎÁÊÄÅÎÏ %d ĞÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
-msgstr "ÉİÕ ĞÁËÅÔÙ ÄÌÑ ĞÏÌÕŞÅÎÉÑ Ó ftp/http\n"
+msgstr "ÉİÕÔÓÑ ĞÁËÅÔÙ ÄÌÑ ĞÏÌÕŞÅÎÉÑ ĞÏ ÓÅÔÉ\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "ĞÒÏĞÕÓËÁÀ %s - ÏÛÉÂËÁ ĞÅÒÅÄÁŞÉ - %s\n"
+msgstr "%s ĞÒÏĞÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ rpmGlob(%d)\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
-msgstr "ğÏÌÕŞÁÀ %s\n"
+msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... ËÁË %s\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
-msgstr "ĞÒÏĞÕÓËÁÀ %s - ÏÛÉÂËÁ ĞÅÒÅÄÁŞÉ - %s\n"
+msgstr "%s ĞÒÏĞÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ĞÅÒÅÄÁŞÉ - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "ĞÏÌÕŞÅÎÏ %d ĞÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
-msgstr ""
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n"
+msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "ĞÁËÅÔ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
-msgstr "ÆÁÊÌ %s ÔÒÅÂÕÅÔ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ RPM\n"
+msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n"
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ĞÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ĞÁËÅÔÙ\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ĞÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ĞÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
-msgstr "õÓÔÁÎÁ×ÌÉ×ÁÀ %s\n"
+msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "ÏÛÉÂËÁ ŞÔÅÎÉÑ: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ×ÔÏÒÏÅ ':' × %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÎÁÚ×ÁÎÉÅ ÁÒÈÉÔÅËÔÕÒÙ × %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "îÅĞÏÌÎÁÑ ÓÔÒÏËÁ ÄÁÎÎÙÈ × %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ÄÁÎÎÙÈ × %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "îÅĞÏÌÎÁÑ ÓÔÒÏËÁ ĞÏ ÕÍÏÌŞÁÎÉÀ × %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× × ÓÔÒÏËÅ ĞÏ ÕÍÏÌŞÁÎÉÀ × %s:%d"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
-msgstr "îÅ ÍÏÇÕ ÒÁÓËÒÙÔØ %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
-msgstr ""
+msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ %s, ÚÎÁŞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ."
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
-msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÄÌÑ ŞÔÅÎÉÑ: %s."
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ŞÔÅÎÉÑ: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
-msgstr "îÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ %s: %s."
+msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ %s: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
-msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ':' × %s:%d"
+msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ':' (ÎÁÊÄÅÎ 0x%02x) × %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÇÕÍÅÎÔ ÄÌÑ %s × %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "ÏÛÉÂËÁ ÒÁÓËÒÙÔÉÑ %s ÎÁ %s:%d \"%s\""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÎÁ %s:%d"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s × %s:%d %s"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ ÁÒÈÉÔÅËÔÕÒÁ ÄÌÑ %s × %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "ÎÅ×ÅÒÎÁÑ ÏĞÃÉÑ '%s' × %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÁ: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "ó×ÑÖÉÔÅÓØ Ó rpm-list@redhat.com\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr "ÒÁÚÍÅÒ ĞÏÄĞÉÓÉ  : %d\n"
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
-msgstr "èÅÄÅÒ + áÒÈÉ×   : %d\n"
+msgid "file is not regular -- skipping size check\n"
+msgstr "ÎÅÏÂÙŞÎÙÊ ÆÁÊÌ -- ĞÒÏĞÕÓËÁÀ ĞÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n"
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
-msgstr "ÏÖÉÄÁÅÍÙÊ ÒÁÚÍÅÒ: %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
+msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
-msgstr "ÎÅ ÏÂÙŞÎÙÊ ÆÁÊÌ -- ĞÒÏĞÕÓËÁÀ ĞÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n"
+#: lib/signature.c:123
+#, fuzzy, c-format
+msgid "  Actual size: %12d\n"
+msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ: %d\n"
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr "ğÏÄĞÉÓÉ ÎÅÔ\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
-msgstr "óÔÁÒÁÑ PGP-ĞÏÄĞÉÓØ\n"
+msgstr "óÔÁÒÁÑ ĞÏÄĞÉÓØ PGP\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 "óÔÁÒÁÑ (ÔÏÌØËÏ ÄÌÑ ×ÎÕÔÒÅÎÎÅÇÏ ÉÓĞÏÌØÚÏ×ÁÎÉÑ) ĞÏÄĞÉÓØ! çÄÅ ×Ù üôï ×ÚÑÌÉ!?"
 
-#: lib/signature.c:157
-msgid "New Header signature\n"
-msgstr "îÏ×ÁÑ ĞÏÄĞÉÓØ ÈÅÄÅÒÁ\n"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
-msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ      : %d\n"
+msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ: %d\n"
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr "úÁĞÏÌÎÉÔÅÌØ ĞÏÄĞÉÓÉ : %d\n"
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
-msgstr "îÅ ÍÏÇÕ ÉÓĞÏÌÎÉÔØ pgp"
+msgstr "î×ÏÚÍÏÖÎÏ ÚÁĞÕÓÔÉÔØ pgp (%s)"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "ÏÛÉÂËÁ pgp"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "ÏÛÉÂËÁ pgp ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
-msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ PGP  : %d\n"
+msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ PGP: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
-msgstr "ÎÅ ÍÏÇÕ ĞÒÏŞÅÓÔØ ĞÏÄĞÉÓØ"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ ĞÏÄĞÉÓØ"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ PGP\n"
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
-msgstr "îÅ ÍÏÇÕ ÉÓĞÏÌÎÉÔØ gpg"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÕÓÔÉÔØ gpg"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr "ÏÛÉÂËÁ gpg"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr "ÏÛÉÂËÁ gpg ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ GPG: %d\n"
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ GPG\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
-msgstr "çÅÎÅÒÉÒÕÀ ĞÏÄĞÉÓØ: %d\n"
+msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ PGP.\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
-msgstr "çÅÎÅÒÉÒÕÀ ĞÏÄĞÉÓØ: %d\n"
+msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ GPG.\n"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
-"îÅ ÍÏÇÕ ÚÁĞÕÓÔÉÔØ pgp. éÓĞÏÌØÚÕÊÔÅ --nopgp ŞÔÏÂÙ ĞÒÏĞÕÓÔÉÔØ ĞÒÏ×ÅÒËÕ PGP."
+"î×ÏÚÍÏÖÎÏ ÚÁĞÕÓÔÉÔØ pgp. éÓĞÏÌØÚÕÊÔÅ --nopgp ŞÔÏÂÙ ĞÒÏĞÕÓÔÉÔØ ĞÒÏ×ÅÒËÕ PGP "
+"ĞÏÄĞÉÓÅÊ."
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr "ÏÛÉÂËÁ ÚÁĞÕÓËÁ!\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
-"îÅ ÍÏÇÕ ÚÁĞÕÓÔÉÔØ gpg. éÓĞÏÌØÚÕÊÔÅ --nogpg ŞÔÏÂÙ ĞÒÏĞÕÓÔÉÔØ ĞÒÏ×ÅÒËÕ GPG."
+"îÅ×ÏÚÍÏÖÎÏ ÚÁĞÕÓÔÉÔØ gpg. éÓĞÏÌØÚÕÊÔÅ --nogpg ŞÔÏÂÙ ĞÒÏĞÕÓÔÉÔØ ĞÒÏ×ÅÒËÕ GPG "
+"ĞÏÄĞÉÓÅÊ."
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
-msgstr "îÅ ÍÏÇÕ ÉÓĞÏÌÎÉÔØ pgp"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÕÓÔÉÔØ pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ"
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
-msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name:\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ"
+msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
-msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name:\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ"
+msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
-msgstr "ÉÓËÌÀŞÁÀ %s\n"
+msgstr "ÉÓËÌÀŞÁÀ ÆÁÊÌ %s%s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
-msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
+msgstr "ÉÓËÌÀŞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
-msgstr "ĞÅÒÅÍÅİÁÀ %s × %s\n"
+msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ %s × %s\n"
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
-msgstr "ĞÅÒÅÍÅİÁÀ %s × %s\n"
+msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ĞÒÏĞÕİÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n"
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
-msgstr "ÎÅ ÍÏÇÕ ÕÄÁÌÉÔØ %s - ËÁÔÁÌÏÇ ÎÅ ĞÕÓÔ"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s - ËÁÔÁÌÏÇ ÎÅ ĞÕÓÔ"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ %s: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
-msgstr "ÕÄÁÌÉÔ ÆÁÊÌÙ; test = %d\n"
+msgstr "ÆÁÊÌÙ ÂÕÄÕÔ ÕÄÁÌÅÎÙ; test = %d\n"
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
-msgstr "ÉÓĞÏÌÎÑÀ ÓËÒÉĞÔ postuninstall (ÅÓÌÉ ÅÓÔØ)\n"
+msgstr "×ÙĞÏÌÎÑÅÔÓÑ ÓËÒÉĞÔ postuninstall (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
-msgstr "ÏÛÉÂËÁ ÉÓĞÏÌÎÅÎÉÑ ÓËÒÉĞÔÁ"
+msgstr "ÏÛÉÂËÁ ×ÙĞÏÌÎÅÎÉÑ ÓËÒÉĞÔÁ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d"
 
 #: lib/verify.c:44
 msgid "don't verify files in package"
@@ -3844,11 +3835,11 @@ msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ĞÁËÅÔÁ"
 
 #: lib/verify.c:218
 msgid "package lacks both user name and id lists (this should never happen)"
-msgstr "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ĞÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÂÙ×ÁÅÔ)"
+msgstr "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ĞÏÌØÚÏ×ÁÔÅÌÅÊ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÄÏÌÖÎÏ ÂÙÔØ)"
 
 #: lib/verify.c:236
 msgid "package lacks both group name and id lists (this should never happen)"
-msgstr "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕĞĞ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÂÙ×ÁÅÔ)"
+msgstr "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕĞĞ, ÎÉ ÉÈ ID (ÔÁË ÎÅ ÄÏÌÖÎÏ ÂÙÔØ)"
 
 #: lib/verify.c:285
 #, c-format
@@ -3860,218 +3851,224 @@ msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
-msgstr "õÄÁÌÏÓØ"
+msgstr "÷ÙĞÏÌÎÅÎÏ"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
-msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ IP-ÁÄÒÅÓ ÓÅÒ×ÅÒÁ"
+msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÁÄÒÅÓ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÌÏËÁÌØÎÙÊ ÆÁÊÌ"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "ïÛÉÂËÁ ĞÒÉ ĞÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ĞÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr "ïÔÍÅÎÁ × ĞÒÏÃÅÓÓÅ"
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ĞÁÒÏÌØ %s\n"
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
-msgstr "======================== ÁËÔÉ×Î %d ĞÕÓÔ. %d\n"
+msgstr "====================== ÁËÔÉ×ÎÙÈ %d ĞÕÓÔÙÈ %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(ĞÕÓÔÏ)"
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(ĞÕÓÔÏ)\n"
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
-msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÏÅ ÔÅÌÏ"
+msgstr "îÅÚÁËÒÙÔÙÊ ÍÁËÒÏÓ %%%s"
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
-msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏĞÕÓÔÉÍÏÅ ÉÍÑ (%%define)"
+msgstr "îÅÄÏĞÕÓÔÉÍÏÅ ÉÍÑ (%%define) ÍÁËÒÏÓÁ %%%s"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
-msgstr "íÁËÒÏÓ %%%s ÓÏÄÅÒÖÉÔ ÎÅÚÁËÒÙÔÙÅ ÏĞÃÉÉ"
+msgstr "îÅÚÁËÒÙÔÙÅ ÏĞÃÉÉ × ÍÁËÒÏÓÅ %%%s"
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
-msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ĞÕÓÔÏÅ ÔÅÌÏ"
+msgstr "íÁËÒÏÓ %%%s ĞÕÓÔ"
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
-msgstr "íÁËÒÏÓ %%%s ÒÁÓËÒÙÔØ ÎÅ ÕÄÁÌÏÓØ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ ÍÁËÒÏÓ %%%s"
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
-msgstr "íÁËÒÏÓ %%%s ÉÍÅÅÔ ÎÅÄÏĞÕÓÔÉÍÏÅ ÉÍÑ (%%undefine)"
+msgstr "îÅÄÏĞÕÓÔÉÍÏÅ ÉÍÑ (%%undefine) ÍÁËÒÏÓÁ %%%s"
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "íÁËÒÏÓ %%%s (%s) ÎÅ ÂÙÌ ÉÓĞÏÌØÚÏ×ÁÎ ÎÉÖÅ ÕÒÏ×ÎÑ %d"
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏĞÃÉÑ %c × %s(%s)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
-msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ max(%d)"
+msgstr "çÌÕÂÉÎÁ ÒÅËÕÒÓÉÉ(%d) ÂÏÌØÛÅ ÄÏĞÕÓÔÉÍÏÊ(%d)"
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "îÅÚÁËÒÙÔÁÑ %c: %s"
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
-msgstr "%% Ó ĞÏÓÌÅÄÕÀİÉÍ ÎÅÒÁÚÂÉÒÁÅÍÙÍ ÍÁËÒÏÓÏÍ"
+msgstr "ÎÅĞÏÎÑÔÎÙÊ ÍÁËÒÏÓ ĞÏÓÌÅ %%"
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
-msgstr "íÁËÒÏÓ %s ÎÅ ÎÁÊÄÅÎ, ĞÒÏĞÕÓËÁÀ"
+msgstr "íÁËÒÏÓ %%%.*s ÎÅ ÎÁÊÄÅÎ, ĞÒÏĞÕÓËÁÀ"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr "ğÅÒÅĞÏÌÎÅÎÉÅ ÃÅÌÅ×ÏÇÏ ÂÕÆÅÒÁ"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "æÁÊÌ %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
-msgstr "æÁÊÌ %s ÍÅÎØÛÅ %d ÂÁÊÔ"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
+msgstr "äÌÉÎÁ ÆÁÊÌÁ %s ÍÅÎØÛÅ ŞÅÍ %d ÂÁÊÔ"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "(ÏÛÉÂËÁ 0x%x)"
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "ÏÛÉÂËÁ: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "ĞÒÅÄÕĞÒÅÖÄÅÎÉÅ: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
-msgstr ""
+msgstr "memory alloc (%u bytes) returned NULL.\n"
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
-msgstr ""
+msgstr "×ÎÉÍÁÎÉÅ: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
-msgstr ""
+msgstr "×ÎÉÍÁÎÉÅ: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
-msgstr ""
+msgstr "×ÎÉÍÁÎÉÅ: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "ğÁÒÏÌØ ÄÌÑ %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
-msgstr "ÏÛÉÂËÁ: %sport ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
+msgstr "ÏÛÉÂËÁ: %s ĞÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
-msgstr "url port ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
+msgstr "url ĞÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n"
+msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
 
-#~ msgid "undefined identifier"
-#~ msgstr "ÎÅÏĞÒÅÄÅÌÅÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
+#~ msgid "sigsize         : %d\n"
+#~ msgstr "ÒÁÚÍÅÒ ĞÏÄĞÉÓÉ  : %d\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅĞÏŞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"
+#~ msgid "Header + Archive: %d\n"
+#~ msgstr "úÁÇÏÌÏ×ÏË + áÒÈÉ×: %d\n"
 
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "      --rcfile <ÆÁÊÌ>     "
+#~ msgid "expected size   : %d\n"
+#~ msgstr "ÏÖÉÄÁÅÍÙÊ ÒÁÚÍÅÒ: %d\n"
+
+#~ msgid "New Header signature\n"
+#~ msgstr "îÏ×ÁÑ ĞÏÄĞÉÓØ ÚÁÇÏÌÏ×ËÁ\n"
+
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "ĞÕÔØ %s - ÎÅ ĞÅÒÅÍÅİÁÅÍÙÊ ÄÌÑ ĞÁËÅÔÁ %s-%s-%s"
 
 #~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
 #~ msgstr "RPMERR_INTERNAL: äÏÓÔÉÇÎÕÔ ĞÒÅÄÅÌ × getUname()\n"
@@ -4080,4 +4077,13 @@ msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n"
 #~ msgstr "RPMERR_INTERNAL: äÏÓÔÉÇÎÕÔ ĞÒÅÄÅÌ × getGname()\n"
 
 #~ msgid "internal error (rpm bug?): "
-#~ msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (ÂÁÇÁ rpm): "
+#~ msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ rpm: "
+
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÃÅÌØ ĞÏÄĞÉÓÉ %s: %s"
+
+#~ msgid "undefined identifier"
+#~ msgstr "ÎÅÏĞÒÅÄÅÌÅÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅĞÏŞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"
diff --git a/po/sk.po b/po/sk.po
index 275d76775..2fbf0d202 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -9,516 +9,516 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "nevyrie¹ené závislosti:\n"
 
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Nie je mo¾né otvori» spec súbor: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Otvorenie rúry pre tar zlyhalo: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Nie je mo¾né preèíta» spec súbor z %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Nie je mo¾né premenova» %s na %s: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "nepodarilo sa zisti» stav %s: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Súbor nie je obyèajnı súbor: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s zrejme nie je RPM balík\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, fuzzy, c-format
 msgid "Building target platforms: %s\n"
 msgstr "predefinova» cieµovú platformu"
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "vyhµadáva sa balík %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzia %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Program mô¾e by» voµne redistribuovanı v súlade s podmienkami GNU GPL"
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "pou¾itie: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "          rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "          rpm {--initdb}   [--dbpath <adresár>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "          rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                           [--replacepkgs] [--replacefiles] [--root "
 "<adresár>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                           [--rcfile <súbor>] [--ignorearch] [--dbpath "
 "<adresár>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                           [--prefix <adresár>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                           [--ftpproxy <poèítaè>] [--ftpport <port>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                           [--httproxy <poèítaè>] [--httpport <port>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                           [--noorder] [--relocate stará_cesta=nová_cesta]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                           [--badreloc] [--notriggers] [--excludepath <path>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                           [--ignoresize] súbor1.rpm ... súborN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "          rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 "                           [--oldpackage] [--root <adresár>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                           [--excludedocs] [--includedocs] [--rcfile <súbor>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                           [--ignorearch]  [--dbpath <adresár>] [--prefix "
 "<adresár>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                           [--httproxy <poèítaè>] [--httpport <port>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                           [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 "                           [--noorder] [--relocate stará_cesta=nová_cesta]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                           [--badreloc] [--excludepath <path>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                           súbor1.rpm ... súborN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "          rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                           [--scripts] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 "                           [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                           [--nomd5] [ciele]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                           [--ftpport <port>] [--provides] [--triggers] "
 "[--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 "                           [--changelog] [--dbpath <adresár>] [targets]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "          rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                           [--dbpath <adresár>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                           [--nomd5] [ciele]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "          rpm {--setperms} [-afpg] [cieµ]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "          rpm {--setugids} [-afpg] [cieµ]"
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                           súbor1.rpm ... súborN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "          rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
 "<súbor>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 "                           [--dbpath <adresár>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                           [--justdb] [--notriggers] balík1 ... balíkN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "          rpm {--resign}   [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "          rpm {--addsign}  [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "          rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<súbor>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                              balík1 ... balíkN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "          rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "          rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "pou¾itie:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "vypísa» túto správu"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "vypísa» verziu pou¾ívaného rpm"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   v¹etky re¾imy podporujú nasledovné argumenty:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    --pipe <príkaz>       "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "vypísa» verziu pou¾ívaného rpm"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <príkaz>       "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "posla» ¹tandardnı vıstup do <príkazu>"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <file>     "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "pou¾i» <súbor> namiesto /etc/rpmrc a $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "o nieèo popisnej¹í re¾im"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "veµmi popisnı re¾im (pre odlaïovanie)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr "   in¹talácia, aktualizácia a otázky (s -p) umo¾òujú pou¾i» ftp URL"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "   namiesto názvov súborov, ako aj nasledujúce voµby:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <poèítaè>"
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "názov poèítaèa alebo IP adresa ftp proxy"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "èíslo portu ftp servera (alebo proxy)"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <poèítaè>"
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr "názov poèítaèa alebo IP adresa http proxy"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr "èíslo portu http servera (alebo proxy)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "re¾im otázok"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <dir>      "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "pou¾i» <adresár> ako adresár pre databázu"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "pou¾i» <qfmt> ako hlavièkovı formát (implikuje -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <dir>        "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "pou¾i» <adresár> ako adresár najvy¹¹ej úrovne"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Voµby pre ¹pecifikáciu balíkov"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "opıta» sa na v¹etky balíky"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <súbor>+       "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "opıta» sa na balík vlastniaci <súbor>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <súbor_balíku>+"
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "opıta» sa (nenain¹talovaného) balíku <súbor_balíku>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <balík>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "opıta» sa na balíky spustené balíkom <balík>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <schopnos»>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr "opıta» sa na balíky poskytujúce schopnos» <schopnos»>"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <schopnos»>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr "opıta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Voµby pre vıber po¾adovanej informácie:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "zobrazi» informácie o balíku"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "zobrazi» históriu zmien balíka"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "zobrazi» zoznam súborov balíka"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "zobrazi» stavy súborov (implikuje -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "zobrazi» len súbory obsahujúce dokumentáciu (implikuje -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "zobrazi» iba konfiguraèné súbory (implikuje -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -526,23 +526,23 @@ msgstr ""
 "zobrazi» v¹etky overiteµné údaje pre ka¾dı súbor (musí by» pou¾ité s -l, -c "
 "alebo -d)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "zobrazi» schopnosti poskytované balíkom"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "zobrazi» závislosti balíka"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "vypísa» rôzne [od]in¹talaèné skripty"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr "zobrazi» spú¹»acie skripty obsiahnuté v balíku"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
@@ -550,142 +550,142 @@ msgstr ""
 "overi» in¹taláciu balíka s pou¾itím rovnakıch volieb ¹pecifikácia balíka ako "
 "pre -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "neoverova» závislosti balíka"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "neoverova» md5 kontrolné súèty súborov"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "neoverova» atribúty súborov"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "vypísa» príznaky, ktoré mô¾u by» pou¾ité vo formáte otázky"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <súbor_balíku>"
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <súbor_balíku>      "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "in¹talova» balík"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <cesta>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr "vynecha» súbory v ceste <cesta>"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "presunú» súbory zo <starej_cesty> do <novej_cesty>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <adresár>  "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "presunú» balík do <adresára>, pokiaµ to balík povoµuje"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "nein¹talova» dokumentáciu"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skratka pre --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "vypisova» znaèky poèas in¹talácie balíka (vhodné s -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "in¹talova» v¹etky súbory vrátane konfiguraènıch súborov, ktoré by inak mohli "
 "by» vynechané"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "neoverova» architektúru balíka"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "pred in¹taláciou nekontrolova» dostupné miesto na disku"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "neoverova» operaènı systém balíka"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "in¹talova» dokumentáciu"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "aktualizova» databázu bez zmeny súborového systému"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "nemeni» poradie balíkov kvôli vyrie¹eniu závislostí"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "nevykona» ¾iadne in¹talaèné skripty"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr "nevykona» ¾iadne skripty spú¹»ané tımto balíkom"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "vypisova» percentá poèas in¹talácie balíka"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "in¹talova» aj pokiaµ balík prepí¹e in¹talované súbory"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "prein¹talova», pokiaµ u¾ balík existuje"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "nein¹talova», ale oznámi», èi by to bolo mo¾né"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <súbor_balíka>"
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr "    -U <súbor_balíka>     "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "aktualizova» balík (rovnaké voµby ako --install, a k tomu)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -693,15 +693,15 @@ msgstr ""
 "aktualizova» na star¹iu verziu balíka (--force to pri aktualizácii urobí "
 "automaticky)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr "    --erase <package>"
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "odin¹talova» balík"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -709,102 +709,102 @@ msgstr ""
 "odin¹talova» v¹etky balíky urèené <balíkom> (inak je chybou, pokiaµ <balík> "
 "¹pecifikuje viac ako jeden balík)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "nevykona» ¾iadne skripty ¹pecifikované balíkom"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<etapa> <spec>      "
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<etapa> <tar_súbor> "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "zostavi» balík, kde <etapa> je jedna z:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "príprava (rozbali» zdrojové súbory a aplikova» záplaty)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrola zoznamu (vykona» niektoré zbe¾né kontroly sekcie %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompilácia (príprava a kompilácia)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "in¹talácia (príprava, kompilácia, in¹talácia)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "binárny balík (príprava, kompilácia, in¹talácia, zabalenie)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "binárny a zdrojovı balík (príprava, kompilácia, in¹talácia, zabalenie)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "preskoèi» priamo k urèenej etape (iba pre c, i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "po ukonèení odstráni» adresár, v ktorom sa balík zostavoval"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr "vytvori» PGP/GPG podpis"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <adresár>   "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "pou¾i» <adresár> pre zostavenie balíka"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr "      --target=<platforma>+"
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "vytvori» balíky pre ciele platforma1...platformaN."
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "nevykona» ¾iadne etapy"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sekúnd>"
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "nastavi» kontrolu èasu na <sekúnd> sekúnd (0 pre deaktiváciu)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <zdroj_balík>"
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -812,65 +812,65 @@ msgstr ""
 "in¹talova» zdrojovı balík, vytvori» binárny balík a odstráni» spec-súbor, "
 "zdroje, záplaty a ikony"
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <src_pkg> "
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "ako --rebuild, ale nezostavi» ¾iadny balík"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <balík>+     "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "podpísa» balík (znièi» aktuálny podpis)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <balík>+    "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "prida» podpis balíku"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <balík>+   "
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    --resign <balík>+     "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "overi» podpis balíka"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "vynecha» akékoµvek PGP podpisy"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr "vynecha» akékoµvek GPG podpisy"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "vynecha» akékoµvek MD5 podpisy"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "uisti» sa, ¾e existuje platná databáza"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "znovu vytvori» databázu z existujúcej"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -878,7 +878,7 @@ msgstr ""
 "nastavi» prístupové práva súborov podµa údajov v databáze balíkov s pou¾itím "
 "rovnakıch volieb ¹pecifikácia balíka ako pre -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -886,149 +886,149 @@ msgstr ""
 "nastavi» vlastníka a skupinu súborov podµa údajov v databáze balíkov s "
 "pou¾itím rovnakıch volieb ¹pecifikácia balíka ako pre -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "mô¾e by» pou¾itı iba jeden hlavnı re¾im"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u a --uninstall sú zastaralé a u¾ nefungujú.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "presunutia musia zaèína» znakom /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "presunutia musia obsahova» znak ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "presunutia musia ma» za znakom = znak /"
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musia zaèína» znakom /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Vnútorná chyba pri spracovaní argumentu (%d) :-(\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "naraz mô¾e by» vykonanı jeden typ otázky alebo overenia"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neoèakávanı zdroj pre otázku"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neoèakávanı zdroj pre otázku"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "neoèakávanı zdroj pre otázku"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "iba in¹talácia, aktualizácia a odstránenie zdrojov mô¾u by» vynútené"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "súbory mô¾u by» presunuté iba poèas inètalácie balíka"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "mo¾e by» pou¾itá iba jedna z volieb --prefix a --relocate"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate a --excludepath mô¾u by» pou¾ité iba poèas in¹talácie novıch "
 "balíkov"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mô¾e by» pou¾itı iba poèas in¹talácie novıch balíkov"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenty pre --prefix musia zaèína» znakom /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mô¾e by» pou¾itı iba poèas in¹talácie balíka"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "mô¾e by» pou¾itá iba jedna voµba z --excludedocs a --includedocs"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mô¾e by» pou¾ité iba poèas odstránenia balíkov"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mô¾e by» pou¾ité iba poèas in¹talácie balíka"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1036,7 +1036,7 @@ msgstr ""
 "--noscripts mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo "
 "overenia balíka"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1044,7 +1044,7 @@ msgstr ""
 "--notriggers mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo "
 "overenia balíka"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1053,7 +1053,7 @@ msgstr ""
 "--nodeps mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo overenia "
 "balíka"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
@@ -1061,7 +1061,7 @@ msgstr ""
 "--test mô¾e by» pou¾ité iba poèas in¹talácie, odstránenia alebo zostavenia "
 "balíka"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1069,786 +1069,748 @@ msgstr ""
 "--root (-r) mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka, "
 "otázky alebo znovuzostavenia databázy"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenty pre --root (-r) musia zaèína» znakom /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage mô¾e by» pou¾íté iba poèas aktualizácie"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp mô¾e by» pou¾íté iba poèas overenia podpisu"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg mô¾e by» pou¾íté iba poèas overenia podpisu"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 mô¾e by» pou¾íté iba poèas overenia podpisu alebo balíka"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "nie je mo¾né pracova» so súborom %s\n"
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr "pgp nebolo nájdené: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Kontrola hesla zlyhala\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Heslo je v poriadku.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "neoèakávané argumenty pre --querytags"
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "neboli zadané ¾iadne balíky pre overenie podpisu"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "neboli zadané ¾iadne balíky na podpis"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "neboli zadané ¾iadne balíky pre odin¹talovanie"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "neboli zadané ¾iadne argumenty pre otázku"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "boli zadané nadbytoèné argumenty otázky pre v¹etky balíky"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "neboli zadané ¾iadne argumenty pre overenie"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr "argument nie je RPM balík\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr "chyba pri èítaní hlavièky balíka\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nie je mo¾né otvori» súbor %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "vypísa» verziu pou¾ívaného rpm"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "pou¾itie: rpm {--help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "          rpm {--initdb}   [--dbpath <adresár>]"
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "          rpm {--rebuilddb} [--rcfile <súbor>] [--dbpath <adresár>]"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "          rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                           [--rcfile <súbor>] [--ignorearch] [--dbpath "
-"<adresár>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                           [--excludedocs] [--includedocs] [--rcfile <súbor>]"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "          rpm {--erase -e} [--root <adresár>] [--noscripts] [--rcfile "
 "<súbor>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"                           [--scripts] [--root <adresár>] [--rcfile <súbor>]"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "          rpm {--verify -V -y} [-afpg] [--root <adresár>] [--rcfile <súbor>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "          rpm {--setperms} [-afpg] [cieµ]"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "          rpm {--setugids} [-afpg] [cieµ]"
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "          rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<súbor>]"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                           [--target=platform1[,platform2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                           [--rmsource] specsúbor"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "          rpm {--rmsource} [--rcfile <súbor>] [-v] specsúbor"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "          rpm {--rebuild}  [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "          rpm {--recompile} [--rcfile <súbor>] [-v] zdroj1.rpm ... zdrojN.rpm"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "                           súbor1.rpm ... súborN.rpm"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "          rpm {--resign}   [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "          rpm {--addsign}  [--rcfile <súbor>] balík1 balík2 ... balíkN"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 "          rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<súbor>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   v¹etky re¾imy podporujú nasledovné argumenty:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    --pipe <príkaz>       "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "vypísa» verziu pou¾ívaného rpm"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    --pipe <príkaz>       "
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "      --rcfile <file>     "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "      --dbpath <dir>      "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "      --root <dir>        "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr "   in¹talácia, aktualizácia a otázky (s -p) umo¾òujú pou¾i» ftp URL"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   namiesto názvov súborov, ako aj nasledujúce voµby:"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "      --ftpproxy <poèítaè>"
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <port>    "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "      --httpproxy <poèítaè>"
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "      --httpport <port>   "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Voµby pre ¹pecifikáciu balíkov"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "opıta» sa na v¹etky balíky"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "        -f <súbor>+       "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "opıta» sa na balík vlastniaci <súbor>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "        -p <súbor_balíku>+"
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "opıta» sa (nenain¹talovaného) balíku <súbor_balíku>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "        --triggeredby <balík>"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "opıta» sa na balíky spustené balíkom <balík>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --whatprovides <schopnos»>"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "opıta» sa na balíky poskytujúce schopnos» <schopnos»>"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --whatrequires <schopnos»>"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "opıta» sa na balíky vy¾adujúce schopnos» <schopnos»>"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 #, fuzzy
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <qfmt>"
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Voµby pre vıber po¾adovanej informácie:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "zobrazi» schopnosti poskytované balíkom"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "zobrazi» schopnosti poskytované balíkom"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "vypísa» rôzne [od]in¹talaèné skripty"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr "zobrazi» spú¹»acie skripty obsiahnuté v balíku"
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "nevykona» ¾iadne etapy"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "    --install <súbor_balíku>"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <súbor_balíku>      "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <cesta>"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 #, fuzzy
 msgid "skip files with leading component <path> "
 msgstr "vynecha» súbory v ceste <cesta>"
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "nevykona» ¾iadne in¹talaèné skripty"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "nevykona» ¾iadne skripty spú¹»ané tımto balíkom"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <adresár>  "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <stará_cesta>=<nová_cesta>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <súbor_balíka>"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -U <súbor_balíka>     "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "    --erase <package>"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<etapa> <spec>      "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -t<etapa> <tar_súbor> "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
 msgstr "balík nemá meno"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "      --buildroot <adresár>   "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "      --target=<platforma>+"
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    --rebuild <zdroj_balík>"
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    --recompile <src_pkg> "
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --resign <balík>+     "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --addsign <balík>+    "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <balík>+   "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    --resign <balík>+     "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "znovu vytvori» databázu z existujúcej"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Namiesto nich pou¾ite -e alebo --erase.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath zadané pre operáciu nepou¾ívajúcu databázu"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb mô¾e by» pou¾ité iba poèas in¹talácie a odstránenia balíka"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nie je mo¾né otvori» doèasnı súbor"
 
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Vykonáva sa: %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "Vykonanie %s zlyhalo (%s)"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr "Chybnı vıstupnı kód z %s (%s)"
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 #, fuzzy
 msgid "syntax error while parsing =="
 msgstr "chyba syntaxe vo vıraze"
 
-#: build/expression.c:237
+#: build/expression.c:238
 #, fuzzy
 msgid "syntax error while parsing &&"
 msgstr "chyba syntaxe vo vıraze"
 
-#: build/expression.c:246
+#: build/expression.c:247
 #, fuzzy
 msgid "syntax error while parsing ||"
 msgstr "chyba syntaxe vo vıraze"
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr "chyba pri analıze vırazu"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr "nepárová ("
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr "- ibe pre èísla"
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr "! iba pre èísla"
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr "typy sa musia zhodova»"
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr "* / nie sú podporované pre re»azce"
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr "- nie je podporované pre re»azce"
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr "&& a || nie sú podporované pre re»azce"
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr "chyba syntaxe vo vıraze"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "chyba PREKROÈENIA ÈASU: %s\n"
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s"
 msgstr "chıbajúce    %s\n"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "chıbajúca ':' na %s:%d"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr "Chybnı %s prvok: %s"
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "Chybná %s() syntax: %s"
 
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "Chybná ¹pecifikácia práv %s(): %s"
 
-#: build/files.c:408
+#: build/files.c:409
 #, fuzzy, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr "Chybná ¹pecifikácia práv adresára %s(): %s"
 
-#: build/files.c:532
+#: build/files.c:533
 #, fuzzy
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr "Iba jeden záznam v %%lang(): %s"
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr "Dosiahnutı limit pre %%docdir"
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr "Iba jeden argument pre %%docdir"
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr "Dva súbory na riadku: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "Súbory musia zaèína» znakom \"/\": %s"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr "Nie je mo¾né mie¹a» ¹peciálne %%doc s inımi formami: %s"
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr "Súbor zadanı dvakrát: %s."
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Súbor nesúhlasí s prefixom (%s): %s."
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr "Súbor nebol nájdenı: %s"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Chybnı vlastník/skupina: %s\n"
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Súbor %4d: 0%o %s.%s\t %s\n"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Súbor potrebuje na zaèiatku \"/\": %s"
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Súbor nebol nájdenı: %s"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "riadok: %s"
@@ -1858,7 +1820,7 @@ msgstr "riadok: %s"
 msgid "Bad file: %s: %s"
 msgstr "súbor %s: %s\n"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "Chybnı vlastník/skupina: %s"
@@ -1884,486 +1846,501 @@ msgstr "%s zlyhalo"
 msgid "failed to write all data to %s"
 msgstr "nepodarilo sa zapísa» v¹etky dáta do %s"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Zis»ujú sa po¾adované vlastnosti...\n"
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Nepodarilo sa zisti» poskytované vlastnosti"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Spracovávajú sa súbory: %s\n"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n"
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr "cpio_copy zápis zlyhal: %s"
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "cpio_copy èítanie zlyhalo: %s"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "Nie je mo¾né otvori» PreIn súbor: %s"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "Nie je mo¾né otvori» PreUn súbor: %s"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "Nie je mo¾né otvori» PostIn súbor: %s"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "Nie je mo¾né otvori» PostUn súbor: %s"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr "Nie je mo¾né otvori» VerifyScript súbor: %s"
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr "Nie je mo¾né otvori» Trigger skriptovı súbor: %s"
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otvorenie %s: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: èítanie %s: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie je RPM balík\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: èítanie hlavièky %s\n"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr "Chybné CSA dáta"
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr "Vytvára sa PGP podpis: %d\n"
+
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:445
-#, c-format
-msgid "Generating signature: %d\n"
-msgstr "Vytvára sa PGP podpis: %d\n"
-
-#: build/pack.c:458
+#: build/pack.c:470
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nie je preèíta» sigtarget: %s"
 
-#: build/pack.c:465
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr "Nie je preèíta» sigtarget: %s"
+msgid "Unable to read header from %s: %s"
+msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:471
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:494
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Nie je mo¾né preèíta» ikonu: %s"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Nie je mo¾né zapísa» balík: %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie je mo¾né vytvori» meno vıstupného súboru pre balík %s: %s\n"
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr "riadok %d: druhı %s"
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr "%%changelog záznamy musia zaèína» *"
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr "nekompletnı %%changelog záznam"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr "chybnı dátum v %%changelog: %s "
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr "%%changelog nie sú v zostupnom chronologickom poradí"
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr "chıbajúce meno v %%changelog"
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr "¾iadny popis v %%changelog"
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr "riadok %d: Chyba pri analıze %%description: %s"
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "riadok %d: Chybná voµba %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr "riadok %d: Priveµa názvov: %s"
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "riadok %d: Balík neexistuje: %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr "riadok %d: Druhı popis"
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr "riadok %d: Chyba pri analıze %%files: %s"
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr "riadok %d: Druhı %%files zoznam"
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr "Architektúra je vynechaná: %s"
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr "Architektúra nie je obsiahnutá: %s"
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr "OS je vynechanı: %s"
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr "OS nie je obsiahnutı: %s"
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr "V balíku musí existova» pole %s: %s"
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr "Duplicitné záznamy %s v balíku: %s"
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr "Neznámy typ ikony: %s"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr "riadok %d: Znetvorenı popis: %s"
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr "riadok %d: Prázdny popis: %s"
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "riadok %d: Neprípustnı znak '-' v %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, fuzzy, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "riadok %d: BuildRoot nemô¾e by» \"/\": %s"
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr "riadok %d: Prefixy nesmú konèi» \"/\": %s"
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "riadok %d: Docdir musí zaèína» '/': %s"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "riadok %d: Epoch/Serial pole musí by» èíslo: %s"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "riadok %d: Chybné %s èíslo: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "riadok %d: Chybnı formát BuildArchitecture: %s"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr "Interná chyba: Èudnı popis %d "
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr "Chybná ¹pecifikácia balíka: %s"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr "Balík u¾ existuje: %s"
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr "riadok %d: Neznámy popis: %s"
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr "Spec súbor nemô¾e pou¾i» BuildRoot"
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr "Chybnı zdroj %s: %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr "Neexistuje patch èíslo %d"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr "Neexistuje zdroj èíslo %d"
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Nebolo mo¾né prenies» nie-zdroj %s: %s"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr "Chyba pri analıze %%setup: %s"
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "riadok %d: Chybnı argument pre %%setup %c: %s"
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "riadok %d: Chybná voµba pre %%setup %s: %s"
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "riadok %d: %%patch -b potrebuje argument: %s"
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "riadok %d: %%patch -z potrebuje argument: %s"
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "riadok %d: %%patch -p potrebuje argument: %s"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "riadok %d: Chybnı argument pre %%patch -p: %s"
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr "Priveµa záplat!"
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "riadok %d: Chybnı argument pre %%patch: %s"
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr "riadok %d: druhı %%prep"
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "riadok %d: %s: prvky musia zaèína» alfanumerickım znakom: %s"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, fuzzy, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "riadok %d: Obsoletes: neobsahuje ¾iadne názvy súborov: %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "riadok %d: Názvy súborov v %s neobsahujú verzie: %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "riadok %d: V %s sú vy¾adované verzie: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr "riadok %d: triggers musia obsahova» --: %s"
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr "riadok %d: Chyba pri analıze %s: %s"
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr "riadok %d: program skriptu musí zaèína» '/': %s"
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr "riadok %d: Druhı %s"
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr "riadok %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "otvorenie zlyhalo: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr "Neuzavretı %%if"
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: %%else bez if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: %%endif bez if"
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr "znetvorenı príkaz %%include"
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr "®iadne zostaviteµné architektúry"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr "Balík neobsahuje %%description: %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr "archív = %s, fs = %s\n"
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr "riadok %d: Chybné èíslo: %s"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr "riadok %d: Chybné no%s èíslo: %d"
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "riadok %d: Chybné %s èíslo: %s\n"
@@ -2378,182 +2355,182 @@ msgstr "premenovanie %s na %s zlyhalo: %s\n"
 msgid "can't unlink %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(chyba 0x%x)"
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr "Chybné magické èíslo"
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr "Chybná/neèitateµná hlavièka"
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr "Priveµká hlavièka"
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr "Neznámy typ súboru"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr " zlyhalo - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraòuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "chybnı stav súboru: %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "vıhradnı"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "zdieµanı"
 
@@ -2582,57 +2559,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, fuzzy, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, fuzzy, c-format
 msgid "removed db environment %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, fuzzy, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
@@ -2648,125 +2625,112 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(nie je èíslo)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr "mntctl() nevrátil veµkos» fuggeru: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr "nepodarilo sa zisti» stav %s: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr "súbor %s sa nachádza na neznámom zariadení"
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
+#, fuzzy
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n"
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovanı\n"
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybnı poèet pre headerAddEntry(): %d\n"
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "chıbajúce { po %"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "chıbajúce } po %{"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "prázdny tag formát"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "prázdne meno tagu"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "neznámy tag"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "] oèakávané na konci poµa"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "neoèakávané ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "neoèakávané }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "? oèakávané vo vıraze"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr "{ oèakávané po ? vo vıraze"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "} oèakávané vo vıraze"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ": oèakávané po ? podvıraze"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr "{ oèakávané po : vo vıraze"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "| oèakávené na konci vırazu"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(neznámy typ)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   súbor: akcia %s: %s\n"
@@ -2781,568 +2745,567 @@ msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
 msgid "group %s does not exist - using root"
 msgstr "skupina %s neexistuje - pou¾ije sa root"
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "hodnota %%instchangelog v makro-súbore by mala by» èíselná, ale nie je"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr "in¹taluje sa zdrojovı balík\n"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr "zdroje v: %s\n"
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-súbor v: %s\n"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "premenovanie %s na %s zlyhalo: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr "oèakávanı zdrojovı balík, nájdenı binárny"
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr "in¹talácia zastavená kvôli re¾imu --test\n"
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr "vykonávajú sa predin¹talaèné skripty (ak existujú)\n"
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varovanie: %s vytvorené ako %s"
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varovanie: %s uchovanı ako %s"
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 #, fuzzy
 msgid "running postinstall scripts (if any)\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr "buildroot u¾ bol zadanı"
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "nájdenıch %d zdrojovıch a %d binárnych balíkov\n"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
 msgstr "nájdenıch %d zdrojovıch a %d binárnych balíkov\n"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 #, fuzzy
 msgid "build source package from tar ball"
 msgstr "zostavi» balík pre OS/architektúru <os>"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr "binárny balík (príprava, kompilácia, in¹talácia, zabalenie)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "in¹taluje sa zdrojovı balík\n"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr "predefinova» adresár pre zostavenie balíka"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr "nevykona» ¾iadne etapy zostavenia"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "neakceptova» lokalizované re»azce zo spec-súboru"
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "po ukonèení odstráni» zdrojové súbory a spec-súbor"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr "predefinova» cieµovú platformu"
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr "pre preklad re»azcov pou¾i» katalóg správ spec-súborov"
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "opıta» sa na balík vlastniaci <súbor>"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "opıta» sa v¹etkıch balíkov v skupine"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "opıta» sa súboru balíka"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "re¾im otázok"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr "opıta» sa spec súboru"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr "opıta» sa balíkov spustenıch balíkom"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "re¾im otázok"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "re¾im otázok"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr "opıta» sa balíkov vy¾adujúcich schopnos»"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr "opıta» sa balíkov poskytujúcich schopnos»"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr "zobrazi» v¹etky konfiguraèné súbory"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr "zobrazi» v¹etky dokumentaèné súbory"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr "zobrazi» základné informácie o balíku"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr "zobrazi» súbory v balíku"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr "pou¾i» nasledovnı formát otázky"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr "zobrazii» stav danıch súborov"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr "zobrazi» podrobnı zoznam súborov balíka"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je vy¾adované %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/problems.c:103
-#, c-format
-msgid "package %s-%s-%s is for a different architecture"
-msgstr ""
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
+msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, fuzzy, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "chyba formátu: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(neobsahuje ¾iadne súbory)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr "normálny      "
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr "nahradenı     "
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr "nein¹talovanı "
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr "zdieµanı      "
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámy %d)  "
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr "(¾iadny stav) "
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "nie je mo¾né pıta» sa zdrojovıch balíkov v starom formáte\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s zrejme nie je RPM balík\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "otázka na %s zlyhala\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "otázka na spec-súbor %s zlyhala, nie je mo¾né analyzova»\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "nájdenıch %d balíkov\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾iadne balíky\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾iadny z balíkov nespú¹»a %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾iadny z balíkov nevy¾aduje %s\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾iadny z balíkov neposkytuje %s\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybné èíslo balíku: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "po¾aduje sa záznam èíslo %d\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "záznam %d nie je mo¾né preèíta»\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otvorenie zlyhalo\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Nie je mo¾né podpísa» v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Nie je mo¾né znovu podpísa» v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispozícii\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr " (CHİBAJÚCE K¥ÚÈE):"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr "V PORIADKU"
 
@@ -3416,7 +3379,7 @@ msgstr "chyba pri zápise záznamu %s do %s"
 msgid "error(%d) removing record %s from %s"
 msgstr "chyba pri odstraòovaní záznamu %s z %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "nebola nastavená ¾iadna dbpath"
 
@@ -3429,515 +3392,510 @@ msgstr ""
 "databázy v novom formáte"
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "chyba pri hµadaní balíka %s\n"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje sa záznam z databázy\n"
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje sa index skupín\n"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "chyba pri hµadaní balíka %s\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáza %s u¾ existuje"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pri vytváraní adresára %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databáze je chybnı -- bol vynechanı"
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie je mo¾né prida» záznam pôvodne na %d"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr "poèítajú sa balíky pre in¹taláciu\n"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "nájdenıch %d balíkov\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr "hµadajú sa balíky, ktoré treba prenies»\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Prená¹a sa %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr "... ako %s\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "prenieslo sa %d balíkov\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie je mo¾né otvori» súbor %s: %s"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie je mo¾né nain¹talova»\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "nájdenıch %d zdrojovıch a %d binárnych balíkov\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "nevyrie¹ené závislosti:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "in¹talujú sa binárne balíky\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstránenie tıchto balíkov by poru¹ilo závislosti:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie je mo¾né otvori» %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "In¹taluje sa %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "èítanie zlyhalo: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "chıbajúce druhé ':' na %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "chıba názov architektúry na %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Neúplnı riadok údajov na %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Priveµa argumentov v riadku údajov na %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Chybné èíslo arch/os: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Neúplnı implicitnı riadok na %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Priveµa argumentov v implicitnom riadku na %s:%d"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Nie je mo¾né expandova» %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Nie je mo¾né preèíta» %s: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "chıbajúca ':' na %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "chıbajúci argument pre %s na %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "expanzia %s zlyhala na %s:%d \"%s\""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "nie je mo¾né otvori» %s na %s:%d"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "chıbajúca architektúra pre %s na %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "chybná voµba '%s' na %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznámy systém: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr "veµkos» podpisu  : %d\n"
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
-msgstr "Hlavièka a archív: %d\n"
+msgid "file is not regular -- skipping size check\n"
+msgstr "nejde o be¾nı súbor - kontrola veµkosti vynechaná\n"
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
-msgstr "oèakávaná veµkos»: %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
+msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
-msgstr "nejde o be¾nı súbor - kontrola veµkosti vynechaná\n"
+#: lib/signature.c:123
+#, fuzzy, c-format
+msgid "  Actual size: %12d\n"
+msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr "Starı PGP podpis\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Starı (iba internı) podpis! Ako ste sa k tomu dostali?!"
 
-#: lib/signature.c:157
-msgid "New Header signature\n"
-msgstr "Nová hlavièka podpisu\n"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr "Doplnenie podpisu: %d\n"
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "Nie je mo¾né spusti» pgp"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp zlyhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "pgp sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Veµkos» PGP podpisu: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "nie je mo¾né preèíta» podpis"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Preèítanı PGP podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr "Nie je mo¾né spusti» gpg"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr "gpg zlyhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr "gpg sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Veµkos» GPG podpisu: %d\n"
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Preèítanı GPG podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "Nie je mo¾né spusti» pgp. Pou¾ite --nopgp pre vynechanie PGP kontrol."
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr "vykonanie zlyhalo!\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "Nie je mo¾né spusti» gpg. Pou¾ite --nogpg pre vynechanie GPG kontrol."
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "Nie je mo¾né spusti» pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr "Chybná ¹pecifikácia podpisu %%_signature v makro-súbore"
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "nie je mo¾né odstráni» %s - adresár nie je prázdny"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "rmdir %s zlyhalo: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "odstránenie %s zlyhalo: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr "budú sa odstraòova» súbory test = %d\n"
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr "vykonávajú sa postdein¹talaèné skripty (ak existujú)\n"
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "vykonanie skriptu zlyhalo"
@@ -3969,219 +3927,225 @@ msgstr "chıbajúce    %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr "Úspech"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr "Chybná odpoveï servera"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr "Chyba vstupu/vıstupu servera"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr "Prekroèenie èasového limitu servera"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr "Nie je mo¾né vyhµada» adresu servera"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr "Nie je mo¾né vyhµada» názov servera"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr "Pripojenie k serveru zlyhalo"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr "Vytvorenie dátového spojenia k serveru zlyhalo"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "Chyba vstupu/vıstupu lokálneho súboru"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Súbor sa na serveri nenachádza"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr "Zru¹enie prebieha"
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr "Neznáma alebo neoèakávaná chyba"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prihlasuje sa na %s ako %s, heslo %s\n"
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktívnych %d prázdnych %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prázdne)"
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prázdne)\n"
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr "Makro %%%s obsahuje neukonèené telo"
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr "Makro %%%s obsahuje chybnı názov (%%define)"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr "Makro %%%s obsahuje neukonèené voµby"
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr "Makro %%%s obsahuje prázdne telo"
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr "Makro %%%s sa nepodarilo expandova»"
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr "Makro %%%s obsahuje chybnı názov (%%undefine)"
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) nebolo pou¾ité pod úrovòou %d "
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Neznáma voµba %c v %s(%s)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "Håbka rekurzie (%d) väè¹ia ako maximálna (%d)"
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Neukonèené %c: %s"
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr "balík %%%.*s nebol nájdenı, vynecháva sa"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr "Preplnenie cieµovej vyrovnávacej pamäti"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "Súbor %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "Súbor %s je men¹í ako %d bajtov"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "(chyba 0x%x)"
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "fatálna chyba: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "chyba: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "varovanie: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Heslo pre %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "chyba: %sport musí by» èíslo\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr "url port musí by» èíslo\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
 
-#~ msgid "undefined identifier"
-#~ msgstr "nedefinovanı identifikátor"
+#~ msgid "sigsize         : %d\n"
+#~ msgstr "veµkos» podpisu  : %d\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "sluèka v re»azi po¾iadaviek: %s"
+#~ msgid "Header + Archive: %d\n"
+#~ msgstr "Hlavièka a archív: %d\n"
+
+#~ msgid "expected size   : %d\n"
+#~ msgstr "oèakávaná veµkos»: %d\n"
+
+#~ msgid "New Header signature\n"
+#~ msgstr "Nová hlavièka podpisu\n"
 
 #, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "      --rcfile <file>     "
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "balík %s nie je nain¹talovanı\n"
 
 #~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
 #~ msgstr "RPMERR_INTERNAL: Dosiahnutı limit v getUname()\n"
@@ -4192,6 +4156,16 @@ msgstr "nepodarilo sa vytvori» %s\n"
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "interná chyba (chyba rpm?): "
 
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Nie je preèíta» sigtarget: %s"
+
+#~ msgid "undefined identifier"
+#~ msgstr "nedefinovanı identifikátor"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "sluèka v re»azi po¾iadaviek: %s"
+
 #~ msgid ""
 #~ "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 #~ msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 4000b46c0..e22484fd9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,520 +1,517 @@
 # -*- 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.105 2000/11/07 13:16:45 jbj Exp $
+# $Id: sl.po,v 1.106 2000/12/12 20:03:59 jbj Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
-"PO-Revision-Date: 2000-02-17 22:25+01:00\n"
-"Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"PO-Revision-Date: 2000-10-08 19:05+0200\n"
+"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "datoteke %s/packages.rpm ni mo¾no odpreti\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
-msgstr "izdelava soodvisnosti neuspe¹na:\n"
+msgstr "izdelava soodvisnosti je bila neuspe¹na:\n"
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
-msgstr "Datoteke spec %s ni mo¾no odpreti: %s\n"
+msgstr "Datoteke s specifikacijami %s ni mo¾no odpreti: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
-msgstr "Povezava s programom tar neuspe¹na: %s\n"
+msgstr "Povezava s programom tar je bila neuspe¹na: %m\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
-msgstr "Neuspe¹no branje datoteke spec iz %s\n"
+msgstr "Neuspe¹no branje datoteke s specifikacijami iz %s"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
-msgstr "Neuspe¹no preimenovanje %s v %s: %s\n"
+msgstr "Preimenovanje %s v %s je bilo neuspe¹no: %m"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "status %s ni na voljo: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Datoteka ni obièajna datoteka: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
-msgstr "Ne ka¾e, da je %s datoteka spec.\n"
+msgstr "Ne ka¾e, da je %s datoteka s specifikacijami."
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM razlièica %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
-msgstr ""
-"Dovoljeno je razmno¾evanje in raz¹irjanje pod pogoji, navedenimi v GNU GPL."
+msgstr "Ta program je dovoljeno razpeèevati pod pogoji navedenimi v GNU GPL."
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
-msgstr "uporaba: rpm {--help}"
+msgstr "Uporaba: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <imenik>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <imenik>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <datoteka>] [--ignorearch] [--dbpath "
 "<imenik>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <imenik>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <raè.>] [--ftpport <vrata>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <raè.>] [--httpport <vrata>] "
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
-msgstr "                        [--noorder] [--relocate stara_pot=nova_pot]"
+msgstr ""
+"                        [--justdb] [--noorder] [--relocate starapot=novapot]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <pot>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <imenik>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <imenik>] [--prefix "
 "<imenik>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <raè.>] [--httpport <vrata>] "
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate stara_pot=nova_pot]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <pot>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
-msgstr "                        [--nomd5] [targets]"
+msgstr "                        [--triggeredby]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
-msgstr ""
-"                        [--ftpport <vrata>] [--provides] [--triggers] "
-"[--dump]"
+msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <imenik>] [targets]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <imenik>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [target]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [target]"
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e} [--root <imenik>] [--noscripts] [--rcfile <datoteka>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <imenik>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] paket1 ... paketN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
 "<datoteka>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paket2"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
-msgstr "uporaba:"
+msgstr "Uporaba:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "to sporoèilo"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
-msgstr "uporabljana razlièica rpm"
+msgstr "razlièica rpm, ki jo uporabljate"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
-msgstr "   vsi naèini podpirajo naslednje argumente:"
+msgstr "   Vsi naèini podpirajo naslednje argumente:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
-msgstr ""
+msgstr "    --define '<ime> <telo>'"
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
-msgstr ""
+msgstr "definirajte makro <ime> z vrednostjo <telo>"
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
-msgstr "    --pipe <ukaz>         "
+msgstr "    --eval '<ime>+'      "
 
-#: rpm.c:298
-#, fuzzy
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
-msgstr "uporabljana razlièica rpm"
+msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <ukaz>         "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
-msgstr "standardni izhod preusmerimo na <ukaz>"
+msgstr "standardni izhod preusmerjen na <ukaz>"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <datoteka> "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "uporabite <datoteka> namesto /etc/rpmrc in $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
-msgstr ""
+msgstr "prika¾i konèni rpmrc in nastavitev makra"
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "z nekaj veè komentarja med potekom"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
-msgstr "z vsem komentarjem (za odpravo napak)"
+msgstr "z vsem komentarjem, ki je na voljo (za odpravo napak)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
-"   namestitev, obnova in poizvedba (z -p) omogoèata, da namesto imen datotek"
+"   Namestitev, obnova in poizvedba (z -p) omogoèata, da namesto imen datotek"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
-msgstr "   navedemo URL za FTP; poleg tega pa ¹e naslednje mo¾nosti:"
+msgstr "   navedete URL za FTP; poleg tega pa ¹e naslednje mo¾nosti:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <raè.>   "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "ime raèunalnika ali IP za zastopnika FTP"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <vrata>   "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "¹tevilka vrat za FTP na stre¾niku ali zastopniku"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <raè.>   "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
-msgstr "ime raèunalnika ali IP za zastopnika HTTP"
+msgstr "ime raèunalnika ali IP za posrednika HTTP"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "      --httpport <vrata>   "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
-msgstr "¹tevilka vrat za HTTP na stre¾niku ali zastopniku"
+msgstr "¹tevilka vrat za HTTP na stre¾niku ali posredniku"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "poizvedbeni naèin"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <imenik>   "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
-msgstr "i¹èi podatkovno zbirko v <imeniku>"
+msgstr "kot imenik za podatkovno zbirko uporabi <imenik>"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <qfmt>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
-msgstr "uporabi <qfmt> kot obliko glave (implicira -i)"
+msgstr "uporabi <qfmt> kot obliko glave (nana¹a se na --info)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <imenik>     "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
-msgstr "uporabi <imenik> za vrhnji imenik"
+msgstr "uporabi <imenik> za korenski imenik"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Mo¾nosti za doloèitev paketov:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "poizvedba po vseh paketih"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <datoteka>+    "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <paket>+       "
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
-msgstr "poizvedba po (¾e name¹èenem) <paketu>"
+msgstr "poizvedba po (odstranjenem) paketu <paket>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pkg>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "poizvedba po paketih, ki jih spro¾i paket <pkg>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <mo¾>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
-msgstr "poizvedba po paketih, ki ponujajo dano <mo¾>nost"
+msgstr "poizvedba po paketih, ki ponujajo dano mo¾nost <mo¾>"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <mo¾>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
-msgstr "poizvedba po paketih, ki potrebujejo dano <mo¾>nost"
+msgstr "poizvedba po paketih, ki zahtevajo dano mo¾nost <mo¾>"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Izbire izbora informacij:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "izpis informacij o paketu"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "izpis dnevnika sprememb paketa"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "izpis seznama datotek v paketu"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
-msgstr "prikaz statusa datotek (privzema -i)"
+msgstr "prikaz stanja datotek (nana¹a se na -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
-msgstr "seznam datotek z dokumetacijo (privzema -i)"
+msgstr "prikaz seznama datotek z dokumetacijo (nana¹a se na -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
-msgstr "seznam nastavitvenih datotek (privzema -i)"
+msgstr "prikaz seznama nastavitvenih datotek (privzema -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -522,164 +519,163 @@ msgstr ""
 "prikaz vseh preverljivih informacij o vsaki datoteki (le skupaj z -l, -c ali "
 "-d)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "izpis mo¾nosti, ki jih nudi paket"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "izpis odvisnosti paketa"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "izpis razliènih (od)namestitvenih skriptov"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr "prikaz pro¾ilnih skriptov, ki jih paket vsebuje"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "namestitev paketa preverimo z enakimi izbirnimi doloèili kot -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "brez preverjanja soodvisnosti paketa"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "brez preverjanja nadzorne vsote md5"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "brez preverjanja prilastkov datotek"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "izpi¹i znaèke, ki pridejo v po¹tev pri poizvedbi"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <paket>      "
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <paket>            "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
-msgstr "namestimo paket"
+msgstr "name¹èanje paketa"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <pot> "
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
-msgstr "preskoèimo datoteke v navedeni poti"
+msgstr "preskok datoteke v navedeni poti"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
-msgstr "datoteke iz stare poti prestavimo v novo"
+msgstr "prestavljanje datoteke iz stare poti v novo"
 
-#: rpm.c:393 rpmqv.c:515
-#, fuzzy
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
-msgstr "poti %s ni mo¾no premakniti za paket %s-%s-%s"
+msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <imenik>   "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
-msgstr "èe je dovoljeno, paket prestavimo v <imenik>"
+msgstr "èe je mogoèe, bo paket prestavljen v imenik <imenik>"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "brez namestitve dokumentacije"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "okraj¹ava za --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "z izpisom znakov # ob namestitvi (uporabno z -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "namestitev vseh datotek, vkljuèno z nastavitvenimi, ki so sicer izpu¹èene"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "brez preverjanja arhitekture paketa"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "brez preverjanja prostora na disku pred name¹èanjem"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "brez preverjanja operacijskega sistema paketa"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "namesti dokumentacijo"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "obnovi podatkovno zbirko, a ne spreminjaj datoteènega sistema"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "brez spreminjanja vrstnega reda paketov z namenom zadovoljevanja soodvisnosti"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
-msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
+msgstr "brez izvajanja skriptov, ki jih po¾ene ta paket"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
-msgstr "z izpisom procentov med namestitvijo"
+msgstr "izpis odstotkov med namestitvijo"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
-msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èenih datotek"
+msgstr "namesti, èetudi paket pi¹e prek ¾e name¹èene datoteke"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "ponovno namesti, èe paket ¾e obstaja"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "ne namesti, a ugotovi, èe bi delovalo"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <paket>      "
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr "    -U <paket>            "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "nadgradi paket (iste izbire kot --install in ¹e:)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -687,119 +683,119 @@ msgstr ""
 "nadgraditev na starej¹o razlièico paketa (--force pri nadgradnjah "
 "avtomatièno vkljuèi to izbiro)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr "    --erase <paket>   "
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
-msgstr "zbri¹i (odstrani) paket"
+msgstr "izbri¹i (odstrani) paket"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
-"odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer izidemo z izidom o "
-"napaki, èe <paket> doloèa veè paketov)"
+"odstrani vse pakete, ki vsebujejo vzorec <paket> (sicer program izide z "
+"napako, èe paket <paket> doloèa veè paketov)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
-msgstr "brez izvajanja katerihkoli skriptov paketa"
+msgstr "brez izvajanja skriptov paketa"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<stopnja> <spec>    "
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<stopnja> <arhiv tar>"
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
-msgstr "zgradi paket do navedene stopnje, ki je ena od:"
+msgstr "zgradi paket, èe je <stopnja> karkoli od:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
-msgstr "priprava (razpakiraj izvorno kodo in uporabi krparije)"
+msgstr "priprava (razpakiraj izvorno kodo in uporabi popravke)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "preverjanje (povr¹no preverjanje %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "prevod (priprava in prevajanje)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "namestitev (pripava, prevajanje, namestitev)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "prevedeni paket (priprava, prevajanje, namestitev, izgradnja paketa)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "prevedeni in izvorni paket (priprava, prevajanje, namestitev, izgradnja "
 "paketa)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
-msgstr "preskoèimo naravnost na doloèeno stopnjo (samo za c,i)"
+msgstr "preskok naravnost na doloèeno stopnjo (samo za c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
-msgstr "po zakljuèku odstranimo delovni imenik"
+msgstr "po zakljuèku drevo imenikov v katerih smo pakete gradili odstrani"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
-msgstr "po zakljuèku odstranimo izvorno kodo"
+msgstr "po zakljuèku naj se izvorna koda izbri¹e"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
-msgstr "po zakljuèku odstranimo datoteko spec"
+msgstr "po zakljuèku naj se datoteka s specifikacijami izbri¹e"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr "izdelava podpisa PGP/GPG"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <imenik>"
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "<imenik> naj bo korenski imenik pri izgradnji"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr "      --target=<s.okolje>+"
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "izgradi pakete za navedena ciljna strojna okolja"
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sek>   "
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "najveèji dopustni èas izgradnje paketa (0 brez omejitev)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <izv.paket> "
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -807,1030 +803,994 @@ msgstr ""
 "Namesti izvorni paket, izgradi prevedeni paket in pobri¹i datoteko spec, "
 "izvorno kodo, krpe in ikone."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <izv.pak.>"
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "kot --rebuild, a brez izgradnje kakr¹negakoli paketa"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <paket>+     "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
-msgstr "podpi¹i paket(e) (trenutni podpis zavr¾emo)"
+msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <paket>+    "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
-msgstr "dodaj podpis k paketu(-om)"
+msgstr "paketu(-om) dodaj podpis"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
-msgstr "    --checksig <paket>+   "
+msgstr "    --checksig <paket>+"
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
-msgstr "    --resign <paket>+     "
+msgstr "    -K <paket>+           "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "preveri podpis paketa(-ov)"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "preskoèi vse podpise PGP"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr "preskoèi vse podpise GPG"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "preskoèi vse podpise MD5"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "preveri, èe obstaja veljavna zbirka"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "ponovno izgradi zbirko iz obstojeèe"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
-"dovoljenja za datoteke postavimo na vrednosti v paketu, z istimi izbirnimi "
-"doloèilili kot pri -q"
+"nastavitev dovoljenja za datoteke na vrednosti v paketu, z istimi izbirnimi "
+"doloèili kot pri -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
-"lastnika in skupino datoteke postavimo na vrednosti v paketu, z istimi "
+"nastavitev lastnika in skupine datoteke na vrednosti v paketu, z istimi "
 "izbirnimi doloèili kot pri -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
-msgstr "samo en glavni naèin sme biti izbran"
+msgstr "izbran sme biti le en glavni naèin"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u in --uninstall nista veè podprti izbiri in ne delujeta veè.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Namesto njiju uporabite -e ali --erase.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
-msgstr "prestavitve se morajo zaèeti z /"
+msgstr "premikanja se morajo zaèeti z /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
-msgstr "prestavitve morajo vsebovati ="
+msgstr "premikanja morajo vsebovati ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
-msgstr "prestavitve morajo imeti /, ki sledi ="
+msgstr "premikanja morajo imeti /, ki mu sledi ="
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
-msgstr "poti, ki jih preskoèimo, se morajo zaèeti z /"
+msgstr "poti, ki niso obdelane, se morajo zaèeti z /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
-msgstr "Interna napake pri obdelavi argumentov (%d)\n"
+msgstr "Notranja napaka pri obdelavi argumentov (%d) :-\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
-msgstr "samo en tip poizvedbe/preverjanja naenkrat je mo¾en"
+msgstr "samo en tip poizvedbe/preverjanja je mo¾en naenkrat"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr "neprièakovane zastavice pri poizvedbi"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr "neprièakovana oblika poizvedbe"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "neprièakovan izvor poizvedbe"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "--force smemo podati samo pri --install --upgrade, --rmsource in --rmspec"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
-msgstr "datoteke lahko prestavimo samo pri namestitvi paketa"
+msgstr "datoteke smemo premakniti samo med namestitvijo paketa"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
-msgstr "izbiri --prefix in --relocate se izkljuèujeta"
+msgstr "izbiri --prefix in --relocate se medsebojno izkljuèujeta"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
-msgstr "izbiri --relocate in --excludepath lahko uporabimo samo pri namestitvi"
+msgstr "izbiri --relocate in --excludepath se lahko uporabi le pri namestitvi"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
-msgstr "--prefix smemo uporabiti samo pri namestitvi"
+msgstr "--prefix se sme uporabiti le pri namestitvi"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti izbire --prefix se morajo zaèeti z /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
-msgstr "--hash (-h) smemo podati samo ob namestitvi paketa"
+msgstr "--hash (-h) sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
-msgstr "--percent smemo podati samo ob namestitvi paketa"
+msgstr "--percent sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
-msgstr "--replacefiles smemo podati samo ob namestitvi paketa"
+msgstr "--replacefiles sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
-msgstr "--replacepkgs smemo podati samo ob namestitvi paketa"
+msgstr "--replacepkgs sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
-msgstr "--excludedocs smemo podati samo ob namestitvi paketa"
+msgstr "--excludedocs sme biti podatn le ob namestitvi paketa"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
-msgstr "--includedocs smemo podati samo ob namestitvi paketa"
+msgstr "--includedocs sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
-msgstr "izbiri --excludedocs in --includedocs se izkljuèujeta"
+msgstr "izbiri --excludedocs in --includedocs se medsebojno izkljuèujeta"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
-msgstr "--ignorearch smemo podati samo ob namestitvi paketa"
+msgstr "--ignorearch sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
-msgstr "--ignoreos smemo podati samo ob namestitvi paketa"
+msgstr "--ignoreos sme podan le ob namestitvi paketa"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
-msgstr "--ignoresize smemo podati samo ob namestitvi paketa"
+msgstr "--ignoresize sme biti podan le ob namestitvi paketa"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
-msgstr "--allmatches smemo podati samo ob odstranitvi paketa"
+msgstr "--allmatches sme biti podan le ob odstranitvi paketa"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
-msgstr "--allfiles smemo podati samo ob namestitvi paketa"
+msgstr "--allfiles sme biti podati le ob namestitvi paketa"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
-msgstr "--justdb smemo podati samo ob namestitvi ali odstranitvi paketa"
+msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
-"--noscripts smemo podati samo ob namestitvi, odstranitvi ali preverjanju "
+"--noscripts sme biti podan le ob namestitvi, odstranitvi ali preverjanju "
 "paketa"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
-"--notriggers smemo podati samo ob namestitvi, odstranitvi ali preverjanju "
+"--notriggers smemo biti podan le ob namestitvi, odstranitvi ali preverjanju "
 "paketa"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
-"--nodeps smemo podati samo ob izgradnji, vnovièni izgradnji, prevajanju, "
+"--nodeps sme biti podan le ob izgradnji, vnovièni izgradnji, prevajanju, "
 "namestitvi, odstranitvi ali preverjanju paketa"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
-"--test smemo podati samo ob namestitvi, odstranitvi ali izgradnji paketa"
+"--test sme biti podan le ob namestitvi, odstranitvi ali izgradnji paketa"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
-"--root (-r) smemo podati samo ob namestitvi, odstranitvi poizvedbi ali "
+"--root (-r) sme biti podan le ob namestitvi, odstranitvi poizvedbi ali "
 "vnovièni izgradnji paketa"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti izbire --root (-r) se morajo zaèeti z /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
-msgstr "--oldpackage smemo podati samo ob nadgradnji"
+msgstr "--oldpackage sme biti podan le ob nadgradnji"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
-msgstr "--nopgp smemo podati samo ob preverjanju podpisa"
+msgstr "--nopgp sme biti podan le ob preverjanju podpisa"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
-msgstr "--nogpg smemo podati samo ob preverjanju podpisa"
+msgstr "--nogpg sme biti podati le ob preverjanju podpisa"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
-msgstr "--nomd5 smemo podati samo ob preverjanju podpisa ali paketa"
+msgstr "--nomd5 sme biti podan le ob preverjanju podpisa ali paketa"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
-msgstr "datoteka za podpis manjka\n"
+msgstr "ni datotek, ki bi jih lahko podpisal\n"
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "dostop do datoteke %s ni mo¾en\n"
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr "pgp manjka: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr "Vnesite pristopno geslo: "
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Preverjanje pristopnega gesla neuspe¹no\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Pristopno geslo je pravo.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
-msgstr "Neveljaven %%_signature v makrodatoteki.\n"
+msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
-msgstr "--sign smemo podati samo ob izgradnji paketa"
+msgstr "--sign sme biti podan le ob izgradnji paketa"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
-msgstr "exec neuspe¹en\n"
+msgstr "izvajanje je bilo neuspe¹no\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "neprièakovani argumenti za --querytags "
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
-msgstr "paketi za preverjanje podpisa niso navedeni"
+msgstr "paketi za katere bi bilo potrebno preveriti podpis niso navedeni"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
-msgstr "paketi za podpisovanje niso navedeni"
+msgstr "paketi katere bi bilo potrebno podpisati niso navedeni"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
-msgstr "paketi za odstranitev niso navedeni"
+msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
-msgstr "paketi za namestitev niso navedeni"
+msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "pri poizvedbi paketov so podani odveèni argumenti"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr "pri preverjanju paketov so podani odveèni argumenti"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr "paketa ni mo¾no odpreti: %s\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr "navedeni argument ni paket RPM\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr "napaka pri branju glave paketa\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "ni mo¾no vnoviè odpreti (payload): %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "uporabljana razlièica rpm"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
-msgstr "uporaba: rpm {--help}"
+msgstr "Uporaba: %s {--help}\n"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
-msgstr "       rpm {--initdb}   [--dbpath <imenik>]"
+msgstr "       %s {--initdb}   [--dbpath <imenik>]\n"
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
-msgstr "       rpm {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgstr "       %s {--rebuilddb} [--rcfile <datoteka>] [--dbpath <imenik>]\n"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
-"       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
-
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <datoteka>] [--ignorearch] [--dbpath "
-"<imenik>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <datoteka>]"
+"       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
-"       rpm {--erase -e} [--root <imenik>] [--noscripts] [--rcfile <datoteka>]"
+"       %s {--erase -e} [--root <imenik>] [--noscripts] [--rcfile "
+"<datoteka>]\n"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"                        [--scripts] [--root <imenik>] [--rcfile <datoteka>]"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
-"       rpm {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]"
+"       %s {--verify -V -y} [-afpg] [--root <imenik>] [--rcfile <datoteka>]\n"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
-msgstr "       rpm {--setperms} [-afpg] [target]"
+msgstr "       %s {--setperms} [-afpg] [target]\n"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
-msgstr "       rpm {--setugids} [-afpg] [target]"
+msgstr "       %s {--setugids} [-afpg] [target]\n"
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
-"       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
-"<datoteka>]"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile "
+"<datoteka>]\n"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=okolje1[,okolje2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] datoteka_spec"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
-msgstr "       rpm {--rmsource} [--rcfile <datoteka>] [-v] datoteka_spec"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
+msgstr "       %s {--rmsource} [--rcfile <datoteka>] [-v] datoteka_spec\n"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
-"       rpm {--rebuild} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm"
+"       %s {--rebuild} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm\n"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
-"       rpm {--recompile} [--rcfile <datoteka>] [-v] izvor1.rpm ... izvorN.rpm"
+"       %s {--recompile} [--rcfile <datoteka>] [-v] izvor1.rpm ... "
+"izvorN.rpm\n"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
-msgstr "       rpm {--freshen -F} datoteka1.rpm ... datotekaN.rpm"
+msgstr "       %s {--freshen -F} datoteka1.rpm ... datotekaN.rpm\n"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
-msgstr "       rpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgstr "       %s {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN\n"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
-msgstr "       rpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgstr "       %s {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
-"       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
-"<datoteka>]"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile "
+"<datoteka>]\n"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
-msgstr "   vsi naèini podpirajo naslednje argumente:"
-
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
+msgstr "   Vsi naèini podpirajo naslednje argumente:"
 
 #: rpmqv.c:406
-#, fuzzy
-msgid "   --eval '<expr>+'       "
-msgstr "    --pipe <ukaz>         "
-
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "uporabljana razlièica rpm"
+msgid "   --define '<name> <body>'"
+msgstr "   --define '<ime> <telo>'"
 
 #: rpmqv.c:408
 #, fuzzy
-msgid "   --pipe <cmd>           "
-msgstr "    --pipe <ukaz>         "
+msgid "   --eval '<name>+'       "
+msgstr "   --eval '<ime>+'       "
 
 #: rpmqv.c:410
 #, fuzzy
-msgid "   --macros <file:...>    "
-msgstr "      --rcfile <datoteka> "
+msgid "   --pipe <cmd>           "
+msgstr "   --pipe <ukaz>         "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
+#: rpmqv.c:412
+#, fuzzy
+msgid "   --rcfile <file>        "
+msgstr "   --rcfile <datoteka> "
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
-msgstr "      --dbpath <imenik>   "
+msgstr "   --dbpath <imenik>   "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
-msgstr "      --root <imenik>     "
+msgstr "   --root <imenik>     "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
-"   namestitev, obnova in poizvedba (z -p) omogoèata, da namesto imen datotek"
+"   Namestitev, obnova in poizvedba (z -p) omogoèata, da namesto imen datotek"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   navedemo URL za FTP; poleg tega pa ¹e naslednje mo¾nosti:"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "      --ftpproxy <raè.>   "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "      --ftpport <vrata>   "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "      --httpproxy <raè.>   "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "      --httpport <vrata>   "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
-msgstr "      Mo¾nosti za doloèitev paketov:"
+msgstr "  Mo¾nosti za doloèitev paketov:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
-msgstr "poizvedba po vseh paketih"
+msgstr "poizvedba/preverba po vseh paketih"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
-msgstr "        -f <datoteka>+    "
+msgstr "     -f <datoteka>+    "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
-msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
+msgstr "poizvedba/preverba po paketu, ki vsebuje <datoteko>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
-msgstr "        -p <paket>+       "
+msgstr "     -p <datotekapaketa>+  "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
-msgstr "poizvedba po (¾e name¹èenem) <paketu>"
+msgstr "poizvedba/preverba po (odstranjenem) paketu <datotekapaketa>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
-msgstr "        --triggeredby <pkg>"
+msgstr "     --triggeredby <pkg>  "
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "poizvedba po paketih, ki jih spro¾i paket <pkg>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --whatprovides <mo¾>"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
-msgstr "poizvedba po paketih, ki ponujajo dano <mo¾>nost"
+msgstr "poizvedba po paketih, ki ponujajo dano zmo¾nost <mo¾>"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --whatrequires <mo¾>"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
-msgstr "poizvedba po paketih, ki potrebujejo dano <mo¾>nost"
+msgstr "poizvedba po paketih, ki potrebujejo dano zmo¾nost <mo¾>"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 #, fuzzy
 msgid "     --queryformat <qfmt> "
 msgstr "      --queryformat <qfmt>"
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Izbire izbora informacij:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "izpis mo¾nosti, ki jih nudi paket"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
-msgstr "izpis mo¾nosti, ki jih nudi paket"
+msgstr "izpis mo¾nosti, ki jih paket potrebuje"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "izpis razliènih (od)namestitvenih skriptov"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 #, fuzzy
 msgid "show the trigger scriptlets contained in the package"
 msgstr "prikaz pro¾ilnih skriptov, ki jih paket vsebuje"
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "    --install <paket>      "
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -i <paket>            "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "      --excludepath <pot> "
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 #, fuzzy
 msgid "skip files with leading component <path> "
-msgstr "preskoèimo datoteke v navedeni poti"
+msgstr "preskok datotek v navedeni poti"
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "brez izvajanja namestitvenih skriptov"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "brez izvajanja katerihkoli skriptov, ki jih po¾ene ta paket"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "      --prefix <imenik>   "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <starapot>=<novapot>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "    --upgrade <paket>      "
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -U <paket>            "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "    --erase <paket>   "
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<stopnja> <spec>    "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -t<stopnja> <arhiv tar>"
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
-msgstr "paket nima imena"
+msgstr "paket vsebuje izvorno kodo"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "      --buildroot <imenik>"
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "      --target=<s.okolje>+"
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    --rebuild <izv.paket> "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    --recompile <izv.pak.>"
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    --resign <paket>+     "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    --addsign <paket>+    "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    --checksig <paket>+   "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
-msgstr "    --resign <paket>+     "
+msgstr "    --K <paket>+     "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
-msgstr ""
+msgstr "nalaganje podatkovne zbirke (nepotrebno, zavr¾ena izbira)"
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
-msgstr "ponovno izgradi zbirko iz obstojeèe"
+msgstr "ponovno izgradi zbirko iz obstojeèih glav"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Namesto njiju uporabite -e ali --erase.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
-msgstr "podani --dbpath ne uporablja podatkovne zbirke"
+msgstr "--dbpath podan, vendar, èeprav nepotreben"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
-msgstr "--justdb smemo podati samo ob namestitvi ali odstranitvi paketa"
+msgstr "--justdb sme biti podan le ob namestitvi ali odstranitvi paketa"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovièno izgradnjo niso navedeni"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Zaèasne datoteke ni mo¾no odpreti"
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
-msgstr "Izvajamo(%s): %s\n"
+msgstr "Izvajanje(%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
-msgstr "Izvajanje %s neuspe¹no (%s): %s"
+msgstr "Izvajanje %s je bilo neuspe¹no (%s): %s"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr "%s javi neuspe¹no izhodno kodo (%s)"
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr "napaka v skladnji pri razèlembi =="
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr "napaka v skladnji pri razèlembi &&"
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr "napaka v skladnji pri razèlembi ||"
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr "napaka pri razèlembi v izrazu"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr "nezakljuèen ("
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr "- samo na ¹tevilih"
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr "! samo na ¹tevilih"
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr "tipi se morajo ujemati"
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
-msgstr "* in / nista podprta na nizih"
+msgstr "* in / nista podprta za nize"
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
-msgstr "- ni podprt na nizih"
+msgstr "- ni podprt za nize"
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
-msgstr "&& in || nista podprta na nizih"
+msgstr "&& in || nista podprta za nize"
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
-msgstr "napaka v sklanji v izrazu"
+msgstr "napaka v sklanji izraza"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK neuspe¹en: %s\n"
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr "Manjkajoèi ,(` v %s %s"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "Manjkajoèi ,)` v %s(%s"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr "Neveljaven ¾eton %s: %s"
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr "Neprazen znak sledi %s(): %s"
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
-msgstr "Okvarjena skladnja: %s(%s)"
+msgstr "Nepravilna skladnja: %s(%s)"
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
-msgstr "Okvarjeno doloèilo naèina: %s(%s)"
+msgstr "Nepravilno doloèilo naèina: %s(%s)"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
-msgstr "Okvarjeno doloèilo naèina imenika: %s(%s)"
+msgstr "Nepravilno doloèilo naèina imenika: %s(%s)"
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr "Nenavadna dol¾ina za locale: \"%.s\" pri %%lang(%s)"
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr "Podvojeni locale %.*s za %%lang(%s)"
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr "Dosegli smo omejitev za %%docdir"
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
-msgstr "Samo en argument za %%docdir je podan"
+msgstr "Za %%docdir je podan samo en argument"
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr "Dve datoteki v eni vrstici: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "Ime datoteke se mora zaèeti z \"/\": %s"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr "Posebnih %%doc ni mo¾no me¹ati z ostalimi oblikami: %s"
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr "Datoteka je navedena dvakrat: %s"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr "Simbolna povezava ka¾e na BuildRoot: %s -> %s"
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Datoteka se ne ujema s predpono (%s): %s"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
-msgstr "Datoteke ni najti: %s"
+msgstr "Datoteke ni mogoèe najti: %s"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
-msgstr "Okvarjen lastnik/skupina: %s\n"
+msgstr "Neobstojeè lastnik/skupina: %s\n"
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Datoteka: %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Datoteki manjka uvodni \"/\": %s"
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s"
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "vrstica: %s"
@@ -1838,12 +1798,12 @@ msgstr "vrstica: %s"
 #: build/files.c:1571
 #, c-format
 msgid "Bad file: %s: %s"
-msgstr "Okvarjena datoteka: %s: %s"
+msgstr "Po¹kodovana datoteka: %s: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
-msgstr "Okvarjen lastnik/skupina: %s"
+msgstr "Neobstojeè lastnik/skupina: %s"
 
 #. XXX this error message is probably not seen.
 #: build/files.c:1638
@@ -1864,493 +1824,508 @@ msgstr "%s neuspe¹en"
 #: build/files.c:1729
 #, c-format
 msgid "failed to write all data to %s"
-msgstr "pisanje podatkov na %s neuspe¹no"
+msgstr "pisanje podatkov v %s je bilo neuspe¹no"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
-msgstr "I¹èemo  %s: (z uporabo %s)...\n"
+msgstr "Iskanje  %s: (z uporabo %s)...\n"
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr "Neuspe¹no iskanje %s:"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
-msgstr "Obdelujemo datoteke: %s-%s-%s\n"
+msgstr "Obdeloavnje datotek: %s-%s-%s\n"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
-msgstr "Iskanje kanoniènega imena gostitelja neuspe¹no: %s\n"
+msgstr "Iskanje kanoniènega imena gostitelja je bilo neuspe¹no: %s\n"
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
-msgstr "ustvarjanje arhiva neuspe¹no za datoteko %s: %s"
+msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr "pisanje cpio_copy neuspe¹no: %s"
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "branje cpio_copy neuspe¹no: %s"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "Datoteke PreIn ni mo¾no odpreti: %s"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "Datoteke PreUn ni mo¾no odpreti: %s"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "Datoteke PostIn ni mo¾no odpreti: %s"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "Datoteke PostUn ni mo¾no odpreti: %s"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr "Datoteke VerifyScript ni mo¾no odpreti: %s"
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr "Skriptne datoteke Trigger ni mo¾no odpreti: %s"
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: odpiranje %s: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: branje %s: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ni paket tipa RPM\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
-msgstr "Okvarjeni podatki CSA"
+msgstr "Po¹kodovani podatki CSA"
+
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:400
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Ni mo¾no zapisati paketa: %s"
 
-#: build/pack.c:445
-#, c-format
-msgid "Generating signature: %d\n"
-msgstr "Izdelujemo podpis: %d\n"
-
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s"
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr "Ciljni podpis %s ni berljiv: %s"
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
+#: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:494
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Ikone %s ni mo¾no prebrati: %s"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Ni mo¾no zapisati paketa %s: %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Neuspe¹no ustvarjanje izhodne datoteke za paket %s: %s\n"
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni mo¾no ustvariti %s: %s\n"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr "vrstica %d: %s sekund"
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr "vnosi %%changelog se morajo zaèeti z *"
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
-msgstr "nezdru¾jiv vnos %%changelog"
+msgstr "nepopoln vnos %%changelog"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
-msgstr "okvarjen datum v %%changelog: %s"
+msgstr "V %%changelog je napaèen datum: %s"
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr "%%changelog ni urejen v padajoèem èasovnem zaporedju"
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
-msgstr "manjkajoèe ime v %%changelog"
+msgstr "v %%changelog je manjkajoèe ime"
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr "opis v %%changelog manjka"
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr "vrstica %d: Napaka pri razèlembi v razdelku %%description: %s"
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
-msgstr "vrstica %d: Okvarjena izbira %s: %s"
+msgstr "vrstica %d: Napaèna izbira %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr "vrstica %d: Preveè imen: %s"
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "vrstica %d: Paket ne obstaja: %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr "vrstica %d: Drugi opis"
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr "vrstica %d: Napaka pri razèlembi v razdelku %%Files: %s"
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr "vrstica %d: Drugi seznam %%Files"
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr "Arhitektura je izkljuèena: %s"
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr "Arhitektura ni vkljuèena: %s"
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr "OS je izkljuèen: %s"
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr "OS ni vkljuèen: %s"
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
-msgstr "polje %s mora obstojati v paketu: %s"
+msgstr "polje %s mora v paketu obstajati: %s"
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr "Podvojeni vnosi %s v paketu: %s"
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Ikone %s ni mo¾no odpreti: %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr "Neznan tip ikone: %s"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr "vrstica %d: Deformirana znaèka: %s"
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr "vrstica %d: Prazna znaèka: %s"
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "vrstica %d: Neveljaven znak ,-` v %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "BuildRoot ne more biti \"/\": %s"
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr "vrstica %d: Predpone se ne smejo konèati z /: %s"
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "vrstica %d: Docdir se mora zaèeti z \"/\": %s"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "vrstica %d: polje Epoch/Serial mora biti ¹tevilo: %s"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "vrstica %d: Okvarjeno ¹tevilo %s: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
-msgstr "vrstica %d: okvarjena oblika BuildArchitecture: %s"
+msgstr "vrstica %d: Napaèna oblika BuildArchitecture: %s"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
-msgstr "Interna napaka: Neprava znaèka %d"
+msgstr "Notranja napaka: Neprava znaèka %d"
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
-msgstr "Okvarjeno doloèilo paketa: %s"
+msgstr "Nepravilno doloèilo paketa: %s"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr "Paket ¾e obstaja: %s"
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr "vrstica %d: Neznana znaèka: %s"
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr "Datoteka spec ne more uporabiti BuildRoot"
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
-msgstr "Okvarjen izvor: %s: %s"
+msgstr "Napaèen izvor: %s: %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
-msgstr "Krparija ¹t. %d manjka"
+msgstr "Popravek ¹t. %d manjka"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr "Izvorna koda ¹t. %d manjka"
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
-msgstr "Ni mo¾no nalo¾iti nosource %s: %s"
+msgstr "Ni mo¾no prenesti nosource %s: %s"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr "Napaka pri razèlembi %%setup: %s"
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
-msgstr "vrstica %d: Okvarjen argument za %%setup %c: %s"
+msgstr "vrstica %d: Nepravilen argument za %%setup %c: %s"
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
-msgstr "vrstica %d: Okvarjena izbira %%setup %s: %s"
+msgstr "vrstica %d: Nepravilna izbira %%setup %s: %s"
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
-msgstr "vrstica %d: Manjkajoè argument za %%patch -b: %s"
+msgstr "vrstica %d: Manjka argument za %%patch -b: %s"
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
-msgstr "vrstica %d: Manjkajoè argument za %%patch -z: %s"
+msgstr "vrstica %d: Manjka argument za %%patch -z: %s"
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
-msgstr "vrstica %d: Manjkajoè argument za %%patch -p: %s"
+msgstr "vrstica %d: Manjka argument za %%patch -p: %s"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
-msgstr "vrstica %d: Okvarjen argument za %%patch -p: %s"
+msgstr "vrstica %d: Nepravilen argument za %%patch -p: %s"
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
-msgstr "Preveè krparij!"
+msgstr "Preveè popravkov!"
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
-msgstr "vrstica %d: Okvarjen argument za %%patch: %s"
+msgstr "vrstica %d: Nepravilen argument za %%patch: %s"
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr "vrstica %d: drugi %%prep"
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
-"vrstica %d: Oznaka odvisnosti se mora zaèeti z alfanum. znakom, ,_` ali ,/`: "
-"%s"
+"vrstica %d: Oznake odvisnosti se morajo zaèeti z alfanum. znakom, ,_` ali\n"
+"'/`: %s"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "vrstica %d: Ime datoteke ni dovoljeno: %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "vrstica %d: Ime datoteke z razlièico ni dovoljeno: %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr "vrstica %d: Zahtevana razlièica: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr "vrstica %d: pro¾ila morajo vsebovati --: %s"
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr "vrstica %d: Napaka pri razèlembi %s: %s"
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr "vrstica %d: skriptni program se mora zaèeti z ,/`: %s"
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr "vrstica %d: Drugi %s"
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr "vrstica %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr "Nezakljuèeni %%if"
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s:%d: parseExpressionBoolean vrne %d"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
-msgstr "%s:%d: Najden %%else brez pripadajoèega if"
+msgstr "%s:%d: Najden je bil %%else brez pripadajoèega if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
-msgstr "%s:%d: Najden %%endif brez pripadajoèega if"
+msgstr "%s:%d: Najden je bil %%endif brez pripadajoèega if"
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr "Deformiran stavek %%include"
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
-msgstr "Arhitektura za izgradnjo manjka"
+msgstr "Arhitektura za izgradnjo ni prisotna"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr "V paketu manjka %%description: %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr "arhiv = %s, fs = %s\n"
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
-msgstr "vrstica %d: Okvarjeno ¹tevilo: %s"
+msgstr "vrstica %d: Napaèno ¹tevilo: %s"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
-msgstr "vrstica %d: Okvarjeno ¹tevilo no%s: %d"
+msgstr "vrstica %d: Napaèno ¹tevilo no%s: %d"
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
-msgstr "vrstica %d: Okvarjeno ¹tevilo %s: %s\n"
+msgstr "vrstica %d: Napaèno ¹tevilo %s: %s\n"
 
 #: lib/cpio.c:444
 #, c-format
@@ -2360,52 +2335,52 @@ msgstr "ni mo¾no preimenovati %s v %s: %s\n"
 #: lib/cpio.c:450
 #, c-format
 msgid "can't unlink %s: %s\n"
-msgstr "ni mo¾no zbrisati %s: %s\n"
+msgstr "ni mo¾no izbrisati %s: %s\n"
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(napaka 0x%x)"
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
-msgstr "Okvarjeno magièno ¹tevilo"
+msgstr "Napaèno magièno ¹tevilo"
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
-msgstr "Okvarjena/neberljiva glava"
+msgstr "Po¹kodovana/neberljiva glava"
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
-msgstr "Glava predolga"
+msgstr "Glava je predolga"
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr "Neznan tip datoteke"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr "Trda povezava manjka"
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
-msgstr "Interna napaka"
+msgstr "Notranja napaka"
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr " neuspe¹no - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2414,214 +2389,216 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %s zadovoljen ob dodatnem seznamu datotek.\n"
+msgstr "%s: %-45s DA (dodane datoteke)\n"
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %s zadovoljen ob dodatni ponudbi.\n"
+msgstr "%s: %-45s DA (dodane ponudbe)\n"
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
-msgstr ""
+msgstr "%s: %-45s %-3s (predpomnjeno)\n"
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
-msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
+msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
+msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
-msgstr ""
+msgstr "%s: %-45s DA (db datoteke)\n"
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
-msgstr "%s: %s zadovoljen ob ponudbi db.\n"
+msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
-msgstr ""
+msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
-msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
+msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
-msgstr "paket %s zahteva, a ni zadovoljeno: %s\n"
+msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
-msgstr "paket %s v sporu: %s\n"
+msgstr "paket %s jw v sporu z: %s\n"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
-msgstr ""
+msgstr "db%d napaka(%d)"
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
-msgstr ""
+msgstr " izvajanje %s"
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
-msgstr ""
+msgstr "zaprta datoteka db       %s\n"
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
-msgstr "odstranjujemo seznam datotek za %s\n"
+msgstr "odstranjena datoteka db        %s\n"
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
-msgstr "okvarjeno stanje datoteke: %s"
+msgstr "po¹kodovana zbirka podatkov %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
-msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
+msgstr "odpiranje datoteke %s v naèinu 0x%x\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "datoteke ni mo¾no %s zakleniti"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
-msgstr "deljeno"
+msgstr "skupno"
 
 #: lib/db2.c:137
 #, c-format
 msgid "closed  db environment %s/%s(%s)\n"
-msgstr ""
+msgstr "zaprto  db okolje %s/%s(%s)\n"
 
 #: lib/db2.c:149
 #, c-format
 msgid "removed db environment %s/%s(%s)\n"
-msgstr ""
+msgstr "odstranjeno db okolje %s/%s(%s)\n"
 
 #: lib/db2.c:186
 #, c-format
 msgid "opening db environment %s/%s(%s) %s\n"
-msgstr ""
+msgstr "odpiranje db okolja %s/%s(%s) %s\n"
 
 #: lib/db2.c:561
 #, c-format
 msgid "closed  db index       %s/%s(%s)\n"
-msgstr ""
+msgstr "zaprto  db kazalo       %s/%s(%s)\n"
 
 #: lib/db2.c:639
 #, c-format
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
-msgstr ""
+msgstr "odpiranje db kazala       %s/%s(%s) %s naèin=0x%x\n"
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
-msgstr ""
+msgstr "dbiSetConfig: neprepoznana izbira db: \"%s\" prezrto\n"
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
-msgstr ""
+msgstr "%s ima neveljavno ¹tevilèno vrednost, prezrto\n"
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
-msgstr ""
+msgstr "%s ima preveliko ali premajhno dolgo (long) vrednost, prezrto\n"
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
+"%s ima preveliko ali premajhno vrednost malega (small) celega\n"
+"¹tevila, prezrto\n"
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, fuzzy, c-format
 msgid "closed  db environment %s/%s\n"
-msgstr "odstranjujemo seznam datotek za %s\n"
+msgstr "zaprto  db okolje %s/%s\n"
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, fuzzy, c-format
 msgid "removed db environment %s/%s\n"
-msgstr "odstranjujemo seznam datotek za %s\n"
+msgstr "odstranjeno db okolje %s/%s\n"
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
-msgstr ""
+msgstr "odpiranje db okolja %s/%s %s\n"
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, fuzzy, c-format
 msgid "closed  db index       %s/%s\n"
-msgstr "odstranjujemo seznam datotek za %s\n"
+msgstr "zaprto  db kazalo       %s/%s\n"
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
-msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
+msgstr "odpiranje db kazala       %s/%s %s naèin=0x%x\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
-msgstr "datoteke ni mo¾no %s zakleniti"
+msgstr "ni mo¾no zakleniti z %s datotek %s/%s\n"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, fuzzy, c-format
 msgid "locked  db index       %s/%s\n"
-msgstr "odstranjujemo seznam datotek za %s\n"
+msgstr "zaklenjeno  db kazalo       %s/%s\n"
 
 #: lib/falloc.c:140
 #, c-format
@@ -2638,125 +2615,112 @@ msgstr ""
 "na strani http://www.rpm.org ali po dopisni listi rpm-list@redhat.com.\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(ni ¹tevilo)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr "mntctl() ni uspe¹no vrnila velikosti fugger: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr "status %s ni na voljo: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
-msgstr "zbiramo seznam priklopljenih datoteènih sistemov.\n"
+msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n"
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "neuspe¹no odpiranje %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr "datoteka %s se nahaja na neznani napravi"
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
+#, fuzzy
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
-msgstr "Okvarjen ¹tevec za headerAddEntry(): %d\n"
+msgstr "Nepravilno stanje ¹tevca za headerAddEntry(): %d\n"
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "manjkajoèi { za %"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "manjkajoèi } za %{"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "oblika znaèke manjka"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "ime znaèke manjka"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "neznana znaèka"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
-msgstr "] ni prièakovan na koncu polja"
+msgstr "na koncu polja je prièakovan ]"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "neprièakovan ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "neprièakovan }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
-msgstr "? prièakovan v izrazu"
+msgstr "v izrazu je prièakovan ?"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
-msgstr "{ prièakovan za ? v izrazu"
+msgstr "v izrazu je za { prièakovan ?"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
-msgstr "} prièakovan v izrazu"
+msgstr "v izrazu je prièakovan }"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
-msgstr ": prièakovan za podizrazom ?"
+msgstr "za podizrazom ? je prièakovano :"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
-msgstr "{ prièakovan za : v izrazu"
+msgstr "v izrazu je za : prièakovan {"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
-msgstr "| prièakovan na koncu izraza"
+msgstr "na koncu izraza je prièakovan |"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(neznan tip)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr " datoteka: %s akcija: %s\n"
@@ -2764,578 +2728,577 @@ msgstr " datoteka: %s akcija: %s\n"
 #: lib/install.c:214
 #, c-format
 msgid "user %s does not exist - using root"
-msgstr "uporabnik %s ne obstaja - uporabljamo root"
+msgstr "uporabnik %s ne obstaja - uporabljam root"
 
 #: lib/install.c:222
 #, c-format
 msgid "group %s does not exist - using root"
-msgstr "skupina %s ne obstaja - uporabljamo root"
+msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "vrednost %%instchangelog v makrodatoteki bi morala biti ¹tevilo, pa ni"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
-msgstr "razpakiranje arhiva neuspe¹no%s%s: %s"
+msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s"
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
-msgstr " pri datoteki "
+msgstr " za datoteko "
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr "name¹èanje izvornega paketa\n"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "ni mo¾no ustvariti izvornega imenika %s"
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
-msgstr "ni mo¾no pisanje na %s"
+msgstr "pisanje na %s ni mo¾no"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr "izvori v: %s\n"
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "ni mo¾no ustvariti imenika z doloèili spec %s"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
-msgstr "datoteka spec v: %s\n"
+msgstr "datoteka s specifikacijami v: %s\n"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
-msgstr "preimenujemo %s v %s\n"
+msgstr "preimenovanje %s v %s\n"
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
-msgstr "preimenovanje %s v %s neuspe¹no: %s"
+msgstr "preimenovanje %s v %s je bilo neuspe¹no: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
-msgstr "prièakovan izvorni paket, najden binarni"
+msgstr "prièakovan je bil izvorni paket, najden binarni"
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
-msgstr "ustavljamo namestitev ker teèemo kot --test\n"
+msgstr "ustavljanje namestitev, ker teèemo kot --test\n"
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
-msgstr "poganjamo prednamestitvene skripte (èe obstajajo)\n"
+msgstr "poganjanje prednamestitvenih skript (èe obstajajo)\n"
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "opozorilo: %s ustvarjen kot %s"
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "opozorilo: %s shranjen kot %s"
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
-msgstr "poganjamo ponamestitvene skripte (èe obstajajo)\n"
+msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
-msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
+msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr "buildroot je ¾e doloèen"
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
-msgstr ""
+msgstr "izgradnja prek stopnje %%prep iz datoteke s specifikacijami"
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
-msgstr ""
+msgstr "izgradnja prek stopnje %%build iz datoteke s specifikacijami"
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
-msgstr ""
+msgstr "izgradnja prek stopnje %%install iz datoteke s specifikacijami"
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
-msgstr "zamenjamo razdelje I18N z naslednjim katalogom"
+msgstr "preverjanje dela datoteke s specifikacijami %%files"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
-msgstr "najdeno %d izvornih in %d binarnih paketov\n"
+msgstr "izgradi izvorni in binarni paket iz datoteke s specifikacijami"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
-msgstr "izvorni paket ne vsebuje datoteke .spec"
+msgstr "izgradi binarni paket iz datoteke .spec"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
-msgstr "izvorni paket ne vsebuje datoteke .spec"
+msgstr "izgradi izvorni paket iz datoteke .spec"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
-msgstr ""
+msgstr "paket izgradi prek stopnje %%prep iz arhiva tar"
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
-msgstr ""
+msgstr "paket izgradi prek stopnje %%build iz arhiva tar"
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
-msgstr ""
+msgstr "paket izgradi prek stopnje %%install iz arhiva tar"
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
-msgstr ""
+msgstr "preverjanje dela %%files iz arhiva tar"
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
-msgstr "najdeno %d izvornih in %d binarnih paketov\n"
+msgstr "iz arhiva tar izgradi izvorni in binarni paket"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
-msgstr ""
+msgstr "iz arhiva tar izgradi binarni paket"
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
-msgstr ""
+msgstr "iz arhiva tar izgradi izvorni paket"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
-msgstr "prevedeni paket (priprava, prevajanje, namestitev, izgradnja paketa)"
+msgstr "binarni paket izgradi iz izvornega"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
-msgstr "name¹èanje izvornega paketa\n"
+msgstr "izgradnja prek stopnje %%install iz izvornega paketa"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
-msgstr "preglasujemo vrhnji imenik izgradnje"
+msgstr "brez upo¹tevanja vrhnjega imenika izgradnje"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
-msgstr "ne izvajamo nobene od stopenj izgradnje"
+msgstr "brez izvajanja katerekoli od stopenj izgradnje"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
-msgstr "ne sprejemamo internacionaliziranih katalogov iz datoteke spec"
+msgstr "brez sprejemanja internacionaliziranih katalogov iz datoteke spec"
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
-msgstr "po zakljuèku odstranimo datoteko spec"
+msgstr "po zakljuèku odstrani datoteko s specifikacijami"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
-msgstr "preglasujemo strojno okolje ciljnega sistema"
+msgstr "brez upo¹tevanja strojnega okolja ciljnega sistema"
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
-msgstr "upo¹tevamo internacionalizirana sporoèila v katalogu spec"
+msgstr "upo¹tevanje internacionalizirana sporoèila v katalogu spec"
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "poizvedba po paketu, ki vsebuje <datoteko>"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "poizvedba po paketu v skupini"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "poizvedba po paketu"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "poizvedbeni naèin"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
-msgstr ""
+msgstr "prika¾i znane znaèke za poizvedovanje"
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr "poizvedba po datoteki spec"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr "poizvedba po paketih, ki jih spro¾i paket"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "poizvedbeni naèin"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
-msgstr "poizvedbeni naèin"
+msgstr "poizvedbeni naèin (opu¹èen)"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr "poizvedba po paketih, ki zahtevajo zmo¾nost"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr "poizvedba po paketih, ki nudijo zmo¾nost"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
-msgstr "seznam vseh nastavitvenih datotek"
+msgstr "izpis vseh nastavitvene datoteke"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
-msgstr "seznam vseh dokumentacijskih datotek"
+msgstr "izpis vseh dokumentacijske datoteke"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr "iznos osnovnih podatkov o datoteki"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
-msgstr "seznam datotek v paketu"
+msgstr "izpis seznama datotek v paketu"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr "uporabi naslednjo obliko poizvedbe"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
-msgstr "zamenjamo razdelje I18N z naslednjim katalogom"
+msgstr "zamenjava razdeljkov I18N z naslednjim katalogom"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr "izpis stanja seznama datotek"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr "izpis ob¹irnega seznama datotek"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " potrebuje %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
-msgstr " v sporu z %s-%s-%s\n"
+msgstr " je v sporu z %s-%s-%s\n"
 
-#: lib/problems.c:103
-#, c-format
-msgid "package %s-%s-%s is for a different architecture"
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
 msgstr "paket %s-%s-%s je za drug tip arhitekture"
 
-#: lib/problems.c:108
-#, c-format
-msgid "package %s-%s-%s is for a different operating system"
+#: lib/problems.c:103
+#, fuzzy, c-format
+msgid "package %s is for a different operating system"
 msgstr "paket %s-%s-%s je za drug operacijski sistem"
 
-#: lib/problems.c:113
-#, c-format
-msgid "package %s-%s-%s is already installed"
+#: lib/problems.c:107
+#, fuzzy, c-format
+msgid "package %s is already installed"
 msgstr "paket %s-%s-%s je ¾e name¹èen"
 
-#: lib/problems.c:118
-#, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
-msgstr "poti %s ni mo¾no premakniti za paket %s-%s-%s"
+#: lib/problems.c:111
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "paketa %s ni mo¾no prestaviti\n"
 
-#: lib/problems.c:123
-#, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
-msgstr "datoteka %s v sporu med poskusom namestitve %s-%s-%s in %s-%s-%s"
+#: lib/problems.c:116
+#, fuzzy, c-format
+msgid "file %s conflicts between attemped installs of %s and %s"
+msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s"
 
-#: lib/problems.c:129
-#, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+#: lib/problems.c:121
+#, fuzzy, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s"
 
-#: lib/problems.c:135
-#, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+#: lib/problems.c:126
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen"
 
-#: lib/problems.c:141
-#, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+#: lib/problems.c:131
+#, fuzzy, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, fuzzy, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
-msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
+msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s"
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+#: lib/problems.c:153
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "napaka v obliki: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(ne vsebuje datotek)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr "normalno      "
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr "nadome¹èeno   "
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr "ni name¹èeno  "
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr "omre¾ni       "
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznano %3d) "
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr "(brez stanja) "
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
-msgstr "ni mo¾no zbrisati %s: %s\n"
+msgstr "ni mo¾no poizvedeti o %s: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
-msgstr "odpiranje %s neuspe¹no: %s\n"
+msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s najverjetneje ni paket RPM\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
-msgstr "poizvedba po %s neuspe¹na\n"
+msgstr "poizvedba po %s je bila neuspe¹na\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
-msgstr "poizvedba po datoteki spec %s neuspe¹na, razèlemba ni mo¾na\n"
+msgstr "poizvedba po datoteki spec. %s je bila neuspe¹na, razèlemba ni mo¾na\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
-msgstr "najdeno %d paketov\n"
+msgstr "ni paketov\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s ne vsebuje nobenega paketa\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "noben paket ne pro¾i %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "noben paket ne potrebuje %s\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna ¹tevilka paketa: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¹tevilka zapisa paketa: %d\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "zapisa %d ni mo¾no prebrati\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name¹èen\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
-msgstr "%s: odpiranje neuspe¹no: %s\n"
+msgstr "%s: odpiranje je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
-msgstr "makeTempFile neuspe¹en\n"
+msgstr "makeTempFile je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
-msgstr "%s: pisanje Fwrite neuspe¹no: %s\n"
+msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
-msgstr "%s: branje Fread neuspe¹no: %s\n"
+msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
-msgstr "%s: readLead neuspe¹en\n"
+msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Podpis RPM v1.0 ni mo¾en\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Sprememba podpisa RPM v2.0 ni mo¾na\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature neuspe¹en\n"
+msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
-msgstr "%s: writeLead neuspe¹en: %s\n"
+msgstr "%s: writeLead je bil neuspe¹en: %s\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
-msgstr "%s: rpmWriteSignature neuspe¹no: %s\n"
+msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOÈI KLJUÈI:"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUÈI:"
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr "V REDU"
 
 #: lib/rpmdb.c:101
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
-msgstr ""
+msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n"
 
 #: lib/rpmdb.c:264
 msgid ""
@@ -3345,16 +3308,21 @@ msgid ""
 "    and configure \"%%_dbapi 3\" (e.g. create and/or edit /etc/rpm/macros).\n"
 "\n"
 msgstr ""
+"\n"
+"--> Ta razlièica rpm ni bila prevedena s podporo za \"%%_dbapi%d\".\n"
+"    Preverite nastavitev makra %%_dbapi z uporabo ukaza \"rpm--showrc\"\n"
+"    in nastavite \"%%_dbapi 3\" (ustvarite in/ali uredite /etc/rpm/macros).\n"
+"\n"
 
 #: lib/rpmdb.c:279
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)"
-msgstr "ni mo¾no odpreti %s v %s:%d: %s"
+msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)"
 
 #: lib/rpmdb.c:299
 #, fuzzy, c-format
 msgid "cannot open %s index"
-msgstr "ni mo¾no odpreti %s: %s\n"
+msgstr "ni mo¾no odpreti kazala %s:"
 
 #: lib/rpmdb.c:314
 #, c-format
@@ -3365,6 +3333,11 @@ msgid ""
 "    your database to db%d format by running \"rpm --rebuilddb\" as root.\n"
 "\n"
 msgstr ""
+"\n"
+"--> Podatkovne zbirke rpm ni mogoèe odpreti v obliki db%d .\n"
+"    Èe ste ravnokar nadgradili paket rpm, morate zbirko podatkov pretvoriti\n"
+"    v obliko db%d tako, da kot root izvedete ukaz \"rpm --rebuilddb\"\n"
+"\n"
 
 #: lib/rpmdb.c:327
 msgid ""
@@ -3375,6 +3348,13 @@ msgid ""
 "/etc/rpm/macros).\n"
 "\n"
 msgstr ""
+"\n"
+"--> Nastavljeni %%_dbapi je bil db%d, podatkovna zbirka pa je v obliki "
+"db%d.\n"
+"    Preverite nastavitev makra %%_dbapi tako, da po¾enete \"rpm --showrc\"\n"
+"    in nastavite \"%%_dbapi %d\" (ustvarite in/ali uredite "
+"/etc/rpm/macros).\n"
+"\n"
 
 #: lib/rpmdb.c:342
 msgid ""
@@ -3386,23 +3366,31 @@ msgid ""
 "    \"%%_dbapi_rebuild %d\" (e.g. create and/or edit /etc/rpm/macros).\n"
 "\n"
 msgstr ""
+"\n"
+"--> Podatkovna zbirka je v obliki db%d, ne pa v priporoèeni obliki db%d.\n"
+"    Preverite nastavitev makrov %%_dbapi in %%_dbapi_rebuild\n"
+"    z uporabo \"rpm --showrc\", in kot root izvedite \"rpm --rebuilddb\"\n"
+"    da bi podatkovno zbirko pretvorili iz oblike db%d v obliko db%d,\n"
+"    ali pa nastavite \"%%_dbapi_rebuild %d\" (ustvarite in/ali uredite\n"
+"   /etc/rpm/macros).\n"
+"\n"
 
 #: lib/rpmdb.c:410
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index"
-msgstr "napaka pri branju zapisa %s iz %s"
+msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
 #: lib/rpmdb.c:528
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s"
-msgstr "napaka pri pisanju zapisa %s v %s"
+msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
 #: lib/rpmdb.c:537
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s"
-msgstr "napaka pri brisanju zapisa %s iz %s"
+msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
@@ -3410,517 +3398,514 @@ msgstr "dbpath ni nastavljena"
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
-msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb"
+msgstr ""
+"da bi staro obliko zbirke podatkov pretvorili v novo po¾enite --rebuilddb"
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
-msgstr "napaka pri iskanju paketa %s\n"
+msgstr "napaka(%d) pri ¹tetju paketov"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
-msgstr "ni mo¾no prebrati glave pri %d za vpogled"
+msgstr "%s: ni mo¾no prebrati glave pri 0x%x"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
-msgstr "odstranjujemo vnose v podatkovni zbirki\n"
+msgstr "odstranjevanje 0 %s vnosov.\n"
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
-msgstr "odstranjujemo seznam skupin\n"
+msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
-msgstr "odstranjujemo seznam imen\n"
+msgstr "odstranjevanje %d vnosov iz kazala %s\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
-msgstr "napaka pri iskanju paketa %s\n"
+msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
-msgstr ""
+msgstr "dodajanje vnosov 0 %s.\n"
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
-msgstr "preimenujemo %s v %s\n"
+msgstr "dodajanje \"%s\" v kazalo %s.\n"
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
-msgstr "preimenujemo %s v %s\n"
+msgstr "dodajanje %d vnosov v kazalo %s.\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
-msgstr "ustvarjamo imenik: %s\n"
+msgstr "ustvarjanje imenika: %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "napaka pri ustvarjanju imenika %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
-msgstr "odpiramo staro podatkovno zbirko\n"
+msgstr "odpiranje stare podatkovne zbirke\n"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
-msgstr "odpiramo novo podatkovno zbirko\n"
+msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
-msgstr "zapis ¹t. %d v zbirki je okvarjen -- preskakujemo."
+msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno."
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "zapisa ni mo¾no dodati na %d"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
-"ponovna izgradnja podatkovne zbirke neuspe¹na; stara ostaja na istem mestu\n"
+"ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n"
+"istem mestu\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
-msgstr "zamenjava stare podatkovne zbirke z novo neuspe¹na!\n"
+msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n"
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
-msgstr "posku¹amo povrniti z nadomestitvijo datotek v %s z datotekami iz %s"
+msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
-msgstr "ustvarjamo imenik: %s\n"
+msgstr "odstranjevanje imenika: %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "paketi za namestitev niso navedeni"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr "¹tetje paketov za namestitev\n"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "najdeno %d paketov\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr "iskanje paketov za prenos po omre¾ju\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
-msgstr "preskakujemo %s - rpmGlob neuspe¹en(%d)\n"
+msgstr "preskoèeno - %s - rpmGlob neuspe¹en(%d)\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
-msgstr "Prena¹amo %s\n"
+msgstr "Prena¹anje %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... kot %s\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
-msgstr "preskakujemo %s - prenos neuspe¹en - %s\n"
+msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
-msgstr "prenesli smo %d paketov\n"
+msgstr "prene¹enih je bilo %d paketov\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ni mo¾no odpreti datoteke %s: %s\n"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ni mo¾no namestiti\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
-msgstr "paketa ni mo¾no odpreti: %s\n"
+msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
-msgstr "paketa %s ni mo¾no prestaviti\n"
+msgstr "paketa %s ni mo¾no premakniti\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "napaka pri branju iz datoteke %s\n"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "datoteka %s zahteva novej¹o razlièico RPM\n"
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "neuspe¹ne soodvisnosti:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
-msgstr "name¹èamo binarne pakete\n"
+msgstr "name¹èanje binarnih paketov\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "datoteke %s/packages.rpm ni mo¾no odpreti\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
-msgstr "\"%s\" doloèa veèterne pakete\n"
+msgstr "\"%s\" doloèa veè paketov\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ni mo¾no odpreti %s: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
-msgstr "Name¹èamo %s\n"
+msgstr "Name¹èanje %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
-msgstr "branje neuspe¹no: %s (%d)"
+msgstr "branje je bilo neuspe¹no: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "manjka drugi ,:` v %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "manjkajoèe ime arhitekture v %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Nepopolna podatkovna vrstica v %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Preveè argumentov v podatkovni vrstici v %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Okvarjena ¹tevilka arh./op.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Nepopolna privzeta vrstica v %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Preveè argumentov v privzeti vrstici v %s:%d"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Ni mo¾no raz¹iriti %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
-msgstr ""
+msgstr "Ni mo¾no prebrati %s, HOME je prevelik."
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
-msgstr "Ni mo¾no odpreti %s za branje: %s."
+msgstr "%s ni mo¾no odpreti za branje: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Neuspe¹no branje %s: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "manjkajoèi ,:` (najden 0x%02x) v %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "manjkajoèi argument za %s v %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
-msgstr "izraz %s neuspe¹en v %s:%d \"%s\""
+msgstr "raz¹iritev %s je bila neuspe¹na v %s:%d \"%s\""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "ni mo¾no odpreti %s v %s:%d: %s"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
-msgstr "manjkajoèa arhitekture za %s v %s:%d"
+msgstr "manjkajoèa arhitektura za %s v %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
-msgstr "okvarjena izbira ,%s` v %s:%d"
+msgstr "nepravilna izbira ,%s` v %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Neznan sistem: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Prosimo, pi¹ite na rpm-list@redhat.com\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr "dol¾ina podpisa : %d\n"
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
-msgstr "glava in arhiv  : %d\n"
+msgid "file is not regular -- skipping size check\n"
+msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
-msgstr "prièakovana vel.: %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
+msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
-msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
+#: lib/signature.c:123
+#, fuzzy, c-format
+msgid "  Actual size: %12d\n"
+msgstr "Dol¾. podpisa : %d\n"
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr "Stari podpis PGP\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
 
-#: lib/signature.c:157
-msgid "New Header signature\n"
-msgstr "Podpis v novi glavi\n"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr "Dol¾. podpisa : %d\n"
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr "Dol¾. polnila : %d\n"
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "Ni mo¾no pognati pgp (%s)"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
-msgstr "pgp neuspe¹en"
+msgstr "pgp je bil neuspe¹en"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
-msgstr "pgp neuspe¹en pri zapisu podpisa"
+msgstr "pgp je bil neuspe¹en pri zapisu podpisa"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dol¾. podpisa PGP: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
-msgstr "branje podpisa neuspe¹no"
+msgstr "branje podpisa je bilo neuspe¹no"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prebrano %d bajtov podpisa PGP\n"
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr "Ni mo¾no pognati gpg"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
-msgstr "gpg neuspe¹en"
+msgstr "gpg je bil neuspe¹en"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
-msgstr "gpg neuspe¹en pri zapisu podpisa"
+msgstr "gpg je boil neuspe¹en pri zapisu podpisa"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dol¾. podpisa GnuPG: %d\n"
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
-msgstr "Ustvarjamo podpis s PGP.\n"
+msgstr "Ustvarjanje podpisa s PGP.\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
-msgstr "Ustvarjamo podpis z GnuPG.\n"
+msgstr "Ustvarjanje podpisa z GnuPG.\n"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "Ni mo¾no pognati pgp. Preverjanja PGP lahko preskoèite z --nopgp"
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
-msgstr "zagon neuspe¹en!\n"
+msgstr "zagon je bil neuspe¹en!\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "Ni mo¾no pognati gpg. Preverjanja GnuPG lahko preskoèite z --nogpg"
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "Ni mo¾no pognati pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr "Neveljavno doloèilo %%_signature v makrodatoteki"
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
-msgstr "izkljuèujemo datoteko %s%s\n"
+msgstr "izkljuèevanje datoteke %s%s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
-msgstr "izkljuèujemo imenik %s\n"
+msgstr "izkljuèevanje imenika %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
-msgstr "prestavljamo %s v %s\n"
+msgstr "premikanje %s v %s\n"
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
-msgstr "prestavljamo imenik %s v %s\n"
+msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n"
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "ni mo¾no odstraniti %s - imenik ni prazen"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
-msgstr "odstranitev imenika %s neuspe¹na: %s"
+msgstr "odstranitev imenika %s je bila neuspe¹na: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
-msgstr "odstranitev %s neuspe¹na: %s"
+msgstr "odstranitev %s je bila neuspe¹na: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr "datoteke bomo odstranili, test = %d\n"
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
-msgstr "poganjamo poodnamestitvene skripte (èe obstajajo)\n"
+msgstr "poganjanje poodnamestitvenih skriptov (èe obstajajo)\n"
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "skript se ni uspe¹no izvedel"
@@ -3932,12 +3917,12 @@ msgstr "brez preverjanja datotek v paketu"
 #: lib/verify.c:218
 msgid "package lacks both user name and id lists (this should never happen)"
 msgstr ""
-"v paketu manjka tako seznam uporabnikov kot identitet (to se ne more zgoditi)"
+"v paketu manjka tako seznam uporabnikov kot identitet (to se ne sme zgoditi)"
 
 #: lib/verify.c:236
 msgid "package lacks both group name and id lists (this should never happen)"
 msgstr ""
-"v paketu manjka tako seznam skupin kot identitet (to se ne more zgoditi)"
+"v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)"
 
 #: lib/verify.c:285
 #, c-format
@@ -3949,206 +3934,206 @@ msgstr "manjka     %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
-msgstr "Uspe¹no"
+msgstr "Uspeh"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
-msgstr "Okvarjen odziv stre¾nika"
+msgstr "Nepravilen odziv stre¾nika"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr "V/I napaka na stre¾niku"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
-msgstr "Potekel èas na stre¾niku"
+msgstr "Èas odziva stre¾nika je potekel"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr "Naslov stre¾nika ni ugotovljiv"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
-msgstr "Ime stre¾nika ni ugotovljivo"
+msgstr "Ime stre¾nika ni bilo ugotovljivo"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr "Neuspe¹en poskus prikljuèitve na stre¾nik"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr "Neuspe¹na vzpostavitev podatkovne povezave s stre¾nikom"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "V/I napaka na lokalni datoteki"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Napaka pri nastavitvi oddaljenega stre¾nika v pasivni naèin"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Datoteke ni mo¾no najti na stre¾niku"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr "Prekinitev v teku"
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr "Neznana ali neprièakovana napaka"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prijava na %s kot %s, geslo %s\n"
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivni %d prazni %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(prazni)"
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prazni)\n"
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr "Makro %%%s vsebuje nezakljuèeno telo"
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%define)"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr "Makro %%%s vsebuje nezakljuèene izbire"
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr "Makro %%%s vsebuje prazno telo"
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr "Makro %%%s se ne raz¹iri"
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr "Makro %%%s vsebuje nedovoljeno ime (%%undefine)"
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) ni bil uporabljen pod ravnijo %d"
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Neznana izbira %c v %s(%s)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "Globina rekurzije (%d) veèja od maksimalne (%d)"
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Nezakljuèeni %c: %s"
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr "Oznaki %% sledi nerazèlenljiv makro"
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
-msgstr "Makro %%%.*s ni najden, preskoèimo"
+msgstr "Makro %%%.*s ni najden - preskoèeno"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
-msgstr "Ciljni medpomnilnik prekoraèen"
+msgstr "Ciljni medpomnilnik je bil prekoraèen"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "Datoteka %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "Datoteka %s je kraj¹a od %d bajtov"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "(napaka 0x%x)"
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "usodna napaka: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "napaka: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "opozorilo: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
-msgstr ""
+msgstr "alokacija pomnilnika (%u bajtov) vrnjeno NIÈ.\n"
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "opozorilo: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "opozorilo: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "opozorilo: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Geslo za %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "napaka: vrata %s morajo biti ¹tevilka\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr "vrata URL morajo biti ¹tevilka\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
@@ -4156,12 +4141,20 @@ msgstr "neuspe¹no ustvarjanje %s: %s\n"
 #~ msgid "undefined identifier"
 #~ msgstr "nedefiniran identifikator"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "zanka v predpogojevani verigi: %s"
+#~ msgid "New Header signature\n"
+#~ msgstr "Podpis v novi glavi\n"
 
-#, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "      --rcfile <datoteka> "
+#~ msgid "sigsize         : %d\n"
+#~ msgstr "dol¾ina podpisa : %d\n"
+
+#~ msgid "Header + Archive: %d\n"
+#~ msgstr "glava in arhiv  : %d\n"
+
+#~ msgid "expected size   : %d\n"
+#~ msgstr "prièakovana vel.: %d\n"
+
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "poti %s ni mo¾no premakniti za paket %s-%s-%s"
 
 #~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
 #~ msgstr "RPMERR_INTERNAL: Dose¾ena omejitev v getUname()\n"
@@ -4172,6 +4165,12 @@ msgstr "neuspe¹no ustvarjanje %s: %s\n"
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "interna napaka (hro¹è v rpm?): "
 
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Ciljni podpis %s ni berljiv: %s"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "zanka v predpogojevani verigi: %s"
+
 #~ msgid ""
 #~ "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 #~ msgstr ""
diff --git a/po/sr.po b/po/sr.po
index a9e17cc1f..bf2fb16ab 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,510 +1,510 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
 "Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
 "--keyword=N_\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "lo¹e meğuzavisnosti:\n"
 
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "neuspelo otvaranje %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s ne lièi na RPM paket\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s ne lièi na RPM paket\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "gre¹ka potrage za paketom %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Mo¾ete slobodno distribuirati dalje pod odredbama GNU GPL"
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "kori¹æenje: {rpm --help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "\trpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpm.c:250
+#: rpm.c:251
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "\t\t\t   paket1 ...paketN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "kori¹æenje:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "¹tampaj ovu poruku"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "napi¹i verziju rpm-a koja se koristi"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   svi re¾imi podr¾avaju sledeæe argumente:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "napi¹i verziju rpm-a koja se koristi"
 
-#: rpm.c:299
+#: rpm.c:300
 #, fuzzy
 msgid "    --pipe <cmd>          "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "po¹alji standardni izlaz u <komandu>"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "koristi <datoteku> umesto /etc/rpmrc i $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "budi malko prièljiviji"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "budi neverovatno prièljiv (zbog nala¾enja gre¹aka)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-ova"
 
-#: rpm.c:312
+#: rpm.c:313
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   na mestu imena datoteka kao i sledeæe opcije:\n"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "ime hosta ili IP ftp proxy-ja"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "broj porta FTP servera (ili proxy)"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "ime hosta ili IP ftp proxy-ja"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "broj porta FTP servera (ili proxy)"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "re¾im upita"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 #, fuzzy
 msgid "      --dbpath <dir>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "koristi <dir> kao direktorijum baze podataka"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "koristi s kao format zaglavlja (povlaèi -i)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "koristi <dir> kao direktorijum najvi¹eg nivoa"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Opcije odrednice paketa:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "upit nad svim paketima"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "upit za (deinstaliran) paket <paketdatoteka>"
 
-#: rpm.c:338
+#: rpm.c:339
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:339
+#: rpm.c:340
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:340
+#: rpm.c:341
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:341
+#: rpm.c:342
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
 
-#: rpm.c:342
+#: rpm.c:343
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpm.c:343
+#: rpm.c:344
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Opcije za selekciju informacije:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "prika¾i informacije o paketu"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "prika¾i dnevnik promene paketa"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "prika¾i listu datoteka u paketu"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "prika¾i stanja datoteka (povlaèi -i)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "prika¾i samo datoteke iz dokumentacije (povlaèi -i)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -512,23 +512,23 @@ msgstr ""
 "poka¾i sve informacije koje se mogu proveriti za svaku datoteku (mora se "
 "koristiti sa -l, -c ili -d)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "poka¾i koja svojstva donosi paket"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "poka¾i zavisnosti paketa"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "ispi¹i razne skriptove za [de]instalaciju"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 #, fuzzy
 msgid ""
 "verify a package installation using the same same package specification "
@@ -536,162 +536,162 @@ msgid ""
 msgstr ""
 "proveri instalaciju paketa koristeæi iste opcije za odreğenje paketa kao i -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "nemoj proveravati zavisnosti paketa"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "nemoj proveravati md5 kontrolne sume datoteke"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "nemoj proveravati atribute datoteke"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "ispi¹i tag-ove koji mogu biti kori¹æeni u formatu upita"
 
-#: rpm.c:385
+#: rpm.c:386
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "instaliraj paket"
 
-#: rpm.c:386
+#: rpm.c:387
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "instaliraj paket"
 
-#: rpm.c:388
+#: rpm.c:389
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "paket %s nije instaliran\n"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "premesti paket u <dir>, ako se mo¾e premestiti"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "nemoj da instalira¹ dokumentaciju"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "skraæenica za --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "pi¹i he¹-znak (#) kako odmièe instaliranje paketa (dobro doğe sa -v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "instaliraj sve datoteke, èak i konfiguracije koje bi inaèe bile preskoèene"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "nemoj proveravati operativni sistem za paket"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "instaliraj dokumentaciju"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "a¾uriraj bazu podataka, ali nemoj menjati fajl-sistem"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 "nemoj preurediti redosled instalacije paketa kako bi zadovoljio zavisnosti"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "nemoj izvr¹iti nijedan instalacioni skript"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "pi¹i procente instalacije paketa"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "instaliraj èak iako æe paket zameniti instalirane datoteke"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "ponovo instaliraj ako je paket veæ prisutan"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "nemoj instalirati, ali reci da li æe da radi ili ne"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "a¾uriraj paket (iste opcije kao --install, plus)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 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)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "izbri¹i (deinstaliraj) paket"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -699,107 +699,107 @@ msgstr ""
 "ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se gre¹ka ako "
 "<paket> oznaèava vi¹e paketa)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "nemoj izvr¹iti nijedan skript iz paketa"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:464
+#: rpm.c:465
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "napravi paket, gde je <faza> jedna od:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "priprema (raspakuj izvorne datoteke i primeni zakrpe)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "provera liste (mala provera na %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompilacija (priprema i kompilacija)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "instalacija (priprema, kompilacija, instalacija)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "bin/src paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "idi pravo do odreğene faze (samo za k,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "ukloni stablo direktorijuma po zavr¹etku"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "napravi PGP potpis"
 
-#: rpm.c:488
+#: rpm.c:489
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: rpm.c:494
+#: rpm.c:495
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:495
+#: rpm.c:496
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "postavi vremensku proveru na S sekundi (0 je deaktivira)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -807,68 +807,68 @@ msgstr ""
 "instaliraj izvorni paket, napravi binarni paket i ukloni specifikaciju, "
 "izvorne datoteke, zakrpe i ikone."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "kao i --rebuild, samo nemoj praviti nikakav paket"
 
-#: rpm.c:503
+#: rpm.c:504
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "potpi¹i paket (ukloni tekuæi potpis)"
 
-#: rpm.c:505
+#: rpm.c:506
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "dodaj potpis u paket"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "proveri potpis u paketu"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "preskoèi sve PGP potpise"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "preskoèi sve PGP potpise"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "preskoèi sve MD5 potpise"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "uveri se da postoji ispravna baza podataka"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -876,7 +876,7 @@ msgstr ""
 "postavi dozvole datoteke kao one u bazi podataka paketa koristeæi iste "
 "opcije za odreğenje datoteka kao i -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -884,150 +884,150 @@ msgstr ""
 "postavi vlasnika i grupu datoteke kao i one u bazi podataka paketa koristeæi "
 "iste opcije za odreğenje datoteka kao i -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "samo jedan glavni re¾im mo¾e biti naveden"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u i --uninstall nisu vi¹e podr¾ani i ne rade vi¹e.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Koristite -e ili --erase.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "preme¹tanja moraju imati znak ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "preme¹tanja moraju imati / praæeno sa ="
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "samo jedan tip upita/provere mo¾e biti urağen odjednom"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "neoèekivan izvor upita"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "neoèekivan izvor upita"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "neoèekivan izvor upita"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "samo instalacija i a¾uriranje mogu biti forsirane"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "datoteke mogu biti preme¹tene samo tokom instalacije paketa"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "samo jedno mo¾ete koristiti: --prefix ili --relocate"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate mo¾ete koristiti samo kad instalirate novi paket"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix mo¾ete koristiti samo kod instalacije novog paketa"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "argumenti za --prefix moraju poèeti znakom /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludecocs mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includecocs mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "samo jedno mo¾ete da navedete: --excludedocs ili --includedocs"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches mo¾ete koristiti samo kod brisanja paketa"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles mo¾ete koristiti samo kod instalacije paketa"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -1035,7 +1035,7 @@ msgstr ""
 "--noscripsts mo¾ete koristiti samo kod instalacije, uklanjanja ili provere "
 "paketa"
 
-#: rpm.c:916
+#: rpm.c:917
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1043,7 +1043,7 @@ msgid ""
 msgstr ""
 "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1051,14 +1051,14 @@ msgid ""
 msgstr ""
 "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1066,777 +1066,743 @@ msgstr ""
 "--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili "
 "rekreiranja baze podataka"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argumenti za --root (-r) moraju poèeti znakom /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage se mo¾e koristiti samo tokom a¾uriranja paketa"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp se mo¾e koristiti samo prilikom provere potpisa"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp se mo¾e koristiti samo prilikom provere potpisa"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nopgp se mo¾e koristiti samo kod provere potpisa ili paketa"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Datoteka nije pronağena na serveru"
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Neuspela provera lozinke\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Lozinka je dobra.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "neoèekivani argumenti za --querytags"
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "nedostaje paket za proveru potpisa"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "nedostaje paket za potpisivanje"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "neodstaje paket za deinstalaciju"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "suvi¹ni argumenti su navedeni za upit nad svim paketima"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "gre¹ka potrage za paketom %s\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "napi¹i verziju rpm-a koja se koristi"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "kori¹æenje: {rpm --help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:299
-#, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
-msgstr "    -b<faza> <spec>\t "
+#: rpmqv.c:301
+#, c-format
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr "\t\t\t   paket1 ...paketN"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "\t\t\t[--badreloc] datoteka1.rpm ... datotekaN.rpm"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "\trpm {--resign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "\trpm {--addsign} [--rcfile <datoteka>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr "\trpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <datoteka>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   svi re¾imi podr¾avaju sledeæe argumente:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "napi¹i verziju rpm-a koja se koristi"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-ova"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   na mestu imena datoteka kao i sledeæe opcije:\n"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Opcije odrednice paketa:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "upit nad svim paketima"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "upit za (deinstaliran) paket <paketdatoteka>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Opcije za selekciju informacije:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "poka¾i koja svojstva donosi paket"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "poka¾i koja svojstva donosi paket"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "ispi¹i razne skriptove za [de]instalaciju"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "instaliraj paket"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "nemoj izvr¹iti nijedan instalacioni skript"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "premesti datoteke iz <starog-puta> u <novi-put>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "instaliraj paket"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "instaliraj paket"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
 msgstr "paket nema imena"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<faza> <spec>\t "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Koristite -e ili --erase.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath je naveden za operaciju koja ne koristi bazu podataka"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Pribavljam %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 #, fuzzy
 msgid "syntax error while parsing =="
 msgstr "oèekivan znak ? u izrazu"
 
-#: build/expression.c:237
+#: build/expression.c:238
 #, fuzzy
 msgid "syntax error while parsing &&"
 msgstr "oèekivan znak ? u izrazu"
 
-#: build/expression.c:246
+#: build/expression.c:247
 #, fuzzy
 msgid "syntax error while parsing ||"
 msgstr "oèekivan znak ? u izrazu"
 
-#: build/expression.c:286
+#: build/expression.c:287
 #, fuzzy
 msgid "parse error in expression"
 msgstr "oèekivan znak ? u izrazu"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 #, fuzzy
 msgid "syntax error in expression"
 msgstr "oèekivan znak ? u izrazu"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s"
 msgstr "nedostaje { posle %"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "nedostaje ':' na %s:%d"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, fuzzy, c-format
 msgid "Two files on one line: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, fuzzy, c-format
 msgid "File listed twice: %s"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Datoteka nije pronağena na serveru"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Datoteka nije pronağena na serveru"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1846,7 +1812,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1872,488 +1838,503 @@ msgstr "PGP omanuo"
 msgid "failed to write all data to %s"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "neuspelo èitanje: %s (%d)"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "gre¹ka: èini se da %s nije RPM paket\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, fuzzy, c-format
+msgid "Generating signature: %d\n"
+msgstr "napravi PGP potpis"
+
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, fuzzy, c-format
-msgid "Generating signature: %d\n"
-msgstr "napravi PGP potpis"
+msgid "Unable to open sigtarget %s: %s"
+msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Ne mogu da upi¹em %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "paket %s nije naveden u %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, fuzzy, c-format
 msgid "Unknown icon type: %s"
 msgstr "(nepoznat tip)"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "pogre¹an broj paketa: %s\n"
+
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, fuzzy, c-format
 msgid "Bad package specification: %s"
 msgstr "      Opcije odrednice paketa:"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, fuzzy, c-format
 msgid "Bad source: %s: %s"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, fuzzy, c-format
 msgid "No patch number %d"
 msgstr "(nije broj)"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "preme¹tanja moraju poèeti znakom '/'"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, fuzzy, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "paket %s nije naveden u %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "paket %s nije naveden u %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "nemoj proveravati arhitekturu paketa"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "paket %s nije naveden u %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "pogre¹an broj paketa: %s\n"
@@ -2368,185 +2349,185 @@ msgstr "Neuspelo èitanje %s: %s."
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "gre¹ka: "
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(nepoznat tip)"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 #, fuzzy
 msgid "Internal error"
 msgstr "fatalna gre¹ka: "
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 #, fuzzy
 msgid " failed - "
 msgstr "PGP omanuo"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "deljeno"
 
@@ -2575,57 +2556,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2641,127 +2622,113 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(nije broj)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr "mntctl() nije vratio 'fugger' velièinu: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, fuzzy, c-format
 msgid "failed to stat %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "nedostaje { posle %"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "nedostaje } posle %"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "prazan 'tag' format'"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "prazno ime tag-a"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "nepoznat tag"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "] oèekivano na kraju niza"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "neoèekivano ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "neoèekivano }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "oèekivan znak ? u izrazu"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ oèekivano posle ? u izrazu"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "} oèekivano u izrazu"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr "oèekivano : praæeno ? podizrazom"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ oèekivano posle : u izrazu"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "| oèekivano na kraju izraza"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(nepoznat tip)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -2776,582 +2743,581 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "instaliraj paket"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "preimenovanje %s u %s nije uspelo: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 #, fuzzy
 msgid "build source package from tar ball"
 msgstr "napravi pakete za operativni sistem <os>"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr "binarni paket (priprema, kompilacija, instalacija, pakovanje)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "instaliraj paket"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 #, fuzzy
 msgid "override build root"
 msgstr "koristi <dir> kao korenski katalog kod kreiranja"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "ukloni izvorne datoteke i datoteku specifikacije po zavr¹etku"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "paket nema imena"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "upit nad svim paketima"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "re¾im upita"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 #, fuzzy
 msgid "query a spec file"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 #, fuzzy
 msgid "query the pacakges triggered by the package"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "re¾im upita"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "re¾im upita"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 #, fuzzy
 msgid "query the packages which require a capability"
 msgstr "upit za pakete koji zahtevaju <i> svojstvo"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 #, fuzzy
 msgid "query the packages which provide a capability"
 msgstr "upit za pakete koji omoguæavaju <i> svojstvo"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 #, fuzzy
 msgid "list all configuration files"
 msgstr "prika¾i samo konfiguracione datoteke (povlaèi -i)"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr "instaliraj dokumentaciju"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "dump basic file information"
 msgstr "prika¾i informacije o paketu"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "list files in package"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 #, fuzzy
 msgid "use the following query format"
 msgstr "neoèekivan izvor upita"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "prika¾i listu datoteka u paketu"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je potreban paketu %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, fuzzy, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, fuzzy, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, fuzzy, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "gre¹ka u formatu: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(nema datoteka)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 #, fuzzy
 msgid "not installed "
 msgstr "paket %s nije instaliran\n"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(nepoznat tip)"
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ne lièi na RPM paket\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeğuje %s\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "ne mogu da proèitam slog %d\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Ne mogu da potpi¹em v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Ne mogu da ponovo potpi¹em v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3425,7 +3391,7 @@ msgstr "gre¹ka zapisivanja sloga %s u %s"
 msgid "error(%d) removing record %s from %s"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "dbpath nije odreğen"
 
@@ -3436,527 +3402,521 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "privremena baza podataka %s veæ postoji"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "lo¹e meğuzavisnosti:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, fuzzy, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" odreğuje vi¹e paketa\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "neuspelo èitanje: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "nedostaje drugo ':' na %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "nedostaje ime arhitekture na %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Nepotpuna linija podataka na %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "Premnogo argumenata u liniji podataka na %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Lo¹ broj arhitekture/oper.sist.: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Nepotpuna podrazumevana linija na %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "Premnogo argumenata u podrazumevanoj liniji na %s:%d"
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "Ne mogu da otvorim datoteku %s: "
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Neuspelo èitanje %s: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "nedostaje ':' na %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "nedostaje argument za %s na %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "nedostaje arhitektura za %s na %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "lo¹a opcija '%s' na %s:%d"
 
-#: lib/rpmrc.c:1202
-#, fuzzy, c-format
+#: lib/rpmrc.c:1205
+#, c-format
 msgid "Unknown system: %s\n"
-msgstr "(nepoznat tip)"
-
-#: lib/rpmrc.c:1203
-msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
+#: lib/rpmrc.c:1206
+msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Stari (interni) potpis!  Odakle vam!?"
 
-#: lib/signature.c:157
-#, fuzzy
-msgid "New Header signature\n"
-msgstr "ne mogu da proèitam potpis"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "Ne mogu da izvr¹im PGP"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "PGP omanuo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "PGP nije uspeo da zapi¹e potpis"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "ne mogu da proèitam potpis"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 #, fuzzy
 msgid "Couldn't exec gpg"
 msgstr "Ne mogu da izvr¹im PGP"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 #, fuzzy
 msgid "gpg failed"
 msgstr "PGP omanuo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 #, fuzzy
 msgid "gpg failed to write signature"
 msgstr "PGP nije uspeo da zapi¹e potpis"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskoèite PGP proveru."
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 #, fuzzy
 msgid "exec failed!\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskoèite PGP proveru."
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "Ne mogu da izvr¹im PGP"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "ne mogu da uklonim %s - direktorijum nije prazan"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "neuspela komanda rmdir %s: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "uklanjanje %s nije uspelo: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "neuspelo izvr¹avanje skripta"
@@ -3984,226 +3944,234 @@ msgstr "nedostaje { posle %"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene meğuzavisnosti za %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 #, fuzzy
 msgid "Bad server response"
 msgstr "Lo¹ odgovor FTP servera"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 #, fuzzy
 msgid "Server IO error"
 msgstr "Ulazno/izlazna FTP gre¹ka"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 #, fuzzy
 msgid "Server timeout"
 msgstr "Tajm-aut FTP servera"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Ne mogu da odredim host adresu FTP servera"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Ne mogu da odredim ime FTP hosta"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Ne mogu da se pove¾em sa FTP serverom"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Datoteka nije pronağena na serveru"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neoèekivana ili nepoznata FTP gre¹ka"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "paket %s nije nağen u %s"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "gre¹ka: "
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "fatalna gre¹ka: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "gre¹ka: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "upozorenje: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lozinka za %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "gre¹ka: FTP port mora biti broj\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "gre¹ka: FTP port mora biti broj\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "petlja u lancu: %s"
+#, fuzzy
+#~ msgid "New Header signature\n"
+#~ msgstr "ne mogu da proèitam potpis"
 
 #, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "    -b<faza> <spec>\t "
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "paket %s nije instaliran\n"
+
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Ne mogu da upi¹em %s"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "petlja u lancu: %s"
 
 #, fuzzy
 #~ msgid ""
@@ -4389,6 +4357,10 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgstr "paket nema imena"
 
 #, fuzzy
+#~ msgid "cannot create %s"
+#~ msgstr "Ne mogu da otvorim datoteku %s: "
+
+#, fuzzy
 #~ msgid "Unable to stat icon: %s"
 #~ msgstr "Ne mogu da upi¹em %s"
 
diff --git a/po/sv.po b/po/sv.po
index c6ed2a683..767e634e6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,489 +1,489 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
-"PO-Revision-Date: 2000-08-07 16:53+0200\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
+"PO-Revision-Date: 2000-10-09 22:31+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:25 lib/rpminstall.c:532
-#, c-format
-msgid "cannot open %s/packages.rpm\n"
-msgstr "kan inte öppna %s/packages.rpm\n"
+#: build.c:26
+#, fuzzy, c-format
+msgid "cannot open rpm database in %s\n"
+msgstr "kan inte öppna paketdatabas i %s\n"
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr "ouppfyllda byggberoenden:\n"
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "Kan inte öppna spec-filen %s: %s\n"
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "Kunde inte öppna \"tar\"-rör: %s\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "Kunde inte läsa spec-fil från %s\n"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "Kunde inte byta namn på %s till %s: %s\n"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "kunde inte ta status på %s: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "Filen är inte en ordinär fil: %s\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "Filen %s tycks inte vara en spec-fil.\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr "Bygger målplattformar: %s\n"
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr "Bygger för målet %s\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr "rpm: %s\n"
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Den här programvaran kan distribueras fritt med hänsyn till GNU GPL"
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr "Användning: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <kat>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <kat>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <kat>] [--ignoreos] [--nodeps] [--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <värd>] [--ftpport <port>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--httpproxy <värd>] [--httpport <port>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                  [--justdb] [--noorder] [--relocate gammalväg=nyväg]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 "                        [--badreloc] [--notriggers] [--excludepath <sökväg>]"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--ignoresize] fil1.rpm ... filN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <kat>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <kat>] [--prefix <kat>] "
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--httpproxy <värd>] [--httpport <port>] "
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate gammalväg=nyväg]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 "                        [--badreloc] [--excludepath <sökväg>] [--ignoresize]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        fil1.rpm ... filN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr "                        [--whatprovides] [--whatrequires] [--requires]"
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr "                        [--triggeredby]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr "                        [--provides] [--triggers] [--dump]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--changelog] [--dbpath <kat>] [mål]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr "       rpm {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <kat>] [--nodeps] [--nofiles] [--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [mål]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [mål]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [mål]"
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "       rpm {--freshen -F} fil1.rpm ... filN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr "       rpm {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <kat>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] [--notriggers] paket1 ... paketN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <fil>] paket1 paket2 ... paketN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <fil>] paket1 paket2 ... paketN"
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paketN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr "Användning:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "visa detta meddelande"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "visa vilken version av rpm som används"
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr "   Alla arbetssätt stödjer följande argument:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr "    --define '<namn> <kropp>'"
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr "definiera makrot <namn> som <kropp>"
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr "    --eval '<namn>+'      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr "skriv ut expansionen av makrot <namn> på standard ut"
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr "    --pipe <kommando>     "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "skicka stdut till <kommando>"
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr "      --rcfile <fil>      "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "använd <fil> istället för /etc/rpmrc och $HOME/.rpmrc"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr "visa slutliga rpmrc- och makrokonfigurationer"
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "var lite mer mångordig"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "var mycket mångordig (för felsökning)"
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   Installation, uppgradering och fråga (med -p) tillåter URL:er att användas"
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr "   istället för filnamn, liksom följande flaggor:"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr "      --ftpproxy <värd>   "
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "ftp-ombudets (proxy) värdnamn eller IP"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr "      --ftpport <port>    "
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "ftp-servers (eller ombuds (proxy)) portnummer"
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr "      --httpproxy <värd>  "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr "http-ombudets värdnamn eller IP"
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr "      --httpport <port>   "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr "http-servers (eller ombuds) portnummer"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "frågeläge"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr "      --dbpath <kat>      "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "använd <kat> som katalog för databasen"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr "      --queryformat <ffmt>"
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "använd <ffmt> som huvudformat (medför --info)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr "      --root <kat>        "
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "använd <kat> som toppkatalog"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Flaggor för paketval:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "fråga om alla paket"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr "        -f <fil>+         "
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "fråga om paket som äger <fil>"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr "        -p <paketfil>+ "
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "fråga om (oinstallerat) paket <paketfil>"
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr "        --triggeredby <pkt>"
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr "fråga om paket utlösta av <pkt>"
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr "        --whatprovides <egenskap>"
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr "undersök paket som tillhandahåller <egenskap>"
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr "        --whatrequires <egenskap>"
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr "undersök paket som behöver <egenskap>"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Flaggor för informationsval:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "visa paketinformation"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "visa paketets ändringslogg"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "visa paketets fillista"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "visa filers status (implicerar -l)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "visa enbart dokumentationsfiler (implicerar -l)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr "visa enbart konfigurationsfiler (implicerar -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -491,164 +491,164 @@ msgstr ""
 "visa all verifierbar information för varje fil (måste användas med -l, -c "
 "eller -d)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "visa de egenskaper paketet tillhandahåller"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "lista paketberoenden"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "visa de olika [av]installationsskripten"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr "visa utlösningsskripten i paketet"
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "verifiera ett pakets installation med samma urvalsflaggor som till -q"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "verifiera inte paketberoenden"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "verifiera inte md5-kontrollsummor"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "verifiera inte filattribut"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "visa taggar som kan användas i frågeformat"
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr "    --install <paketfil>"
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr "    -i <paketfil>         "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "installera paket"
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr "      --excludepath <sökväg>"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr "hoppa över filer i <sökv>"
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "      --relocate <frånskv>=<tillskv>"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "flytta filer från <frånskv> till <tillskv>"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr "relokera filer i ej relokerbart paket"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr "      --prefix <katalog>  "
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "flytta paketet till <katalog>, om flyttbart"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "installera inte dokumentation"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "kortform för --replacepkgs --replacefiles"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 "skriv ut brädgårdar allt eftersom paketet installeras (bra tillsammans med "
 "-v)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "installera alla filer, även konfigurationer som annars kunde hoppats över"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "verifiera inte paketarkitektur"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr "kontrollera inte diskutrymme före installation"
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "verifiera inte paketets operativsystem"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "installera dokumentation"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "uppdatera databasen, men ändra inte filsystemet"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "flytta inte om paketinstallationen för att tillfredsställa beroenden"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "kör inte installationsskript"
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr "kör inte utlösningsskript utlösta av detta paket"
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "skriv procent allt eftersom paketet installeras"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "installera även om paketet byter ut installerade filer"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "installera om ifall paketet redan är installerat"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "installera inte, men tala om ifall det skulle fungera eller inte"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr "    --upgrade <paketfil>"
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr "    -U <paketfil>         "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "uppgradera paket (samma flaggor som --install, samt)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -656,15 +656,15 @@ msgstr ""
 "uppgradera till en gammal version av paketet (--force vid uppgraderingar gör "
 "detta automatiskt)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr "    --erase <paket>"
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "ta bort (avinstallera) paket"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -672,100 +672,100 @@ msgstr ""
 "ta bort alla paket som matchar <paket> (normalt ger det ett fel om <paket> "
 "specificerar flera paket)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "kör inte paketspecifika skript"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<steg> <spec>       "
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr "    -t<steg> <tarboll>    "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "tillverka paket, där <steg> är något av:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "förbered (packa upp källkod samt applicera patchar)"
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrollera (gör några enkla kontroller på %files)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "kompilera (förbered och kompilera)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "installera (förbered, kompilera, installera)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr "binärpaketera (förbered, kompilera, installera, paketera)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr "binär- och källpaketera (förbered, kompilera, installera, paketera)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "gå direkt till angivet steg (endast för c,i)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "ta bort tillverkningsträd efteråt"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr "ta bort källkod efteråt"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr "ta bort spec-fil efteråt"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr "tillverka en PGP/GPG-signatur"
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr "      --buildroot <kat>   "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "använd <kat> som tillverkningsrot"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr "      --target=<plattfrm>+"
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr "tillverka paketen för målen plattfrm1...plattfrmN."
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "utför inga steg"
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr "      --timecheck <sek>   "
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "sätt tidskontrollen till <sek> sekunder (0 slår av)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr "    --rebuild <källpaket> "
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -773,63 +773,63 @@ msgstr ""
 "installera källpaket, tillverka binärpaket och ta bort spec-fil, källkod, "
 "patchar och ikoner."
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr "    --recompile <källpkt> "
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "som --rebuild, men tillverka inga paket"
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr "    --resign <pkt>+       "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "signera ett paket (släng nuvarande signatur)"
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr "    --addsign <pkt>+      "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "lägg till signatur till ett paket"
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr "    --checksig <pkt>+"
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr "    -K <pkt>+             "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "verifiera paketsignatur"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "hoppa över eventuella PGP-signaturer"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr "hoppa över eventuella GPG-signaturer"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "hoppa över eventuella MD5-signaturer"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "förvissa dig om att en giltig databas existerar"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "bygg om databasen från existerande databas"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -837,7 +837,7 @@ msgstr ""
 "sätt filrättigheterna till de i paketdatabasen med samma "
 "paketspecifikationsflaggor som -q"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -845,147 +845,147 @@ msgstr ""
 "sätt filägare och -grupp till de i paketdatabasen med samma "
 "paketspcifikationsflaggor som -q"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "enbart ett läge kan specifieras"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u och --uninstall undanbedes och fungerar inte längre.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Använd -e eller --erase istället.\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "omflyttningar måste börja med /"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "omflyttningar måste innehålla ett ="
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "omflyttningar måste ha ett / efter ="
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr "uteslutna sökvägar måste börja med /"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr "Internt fel i argumenthantering (%d) :-(\n"
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "endast en typ av undersökning/verifiering kan utföras åt gången"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr "oväntade undersökningsflaggor"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr "oväntat undersökningsformat"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "oväntad undersökningskälla"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 "enbart installation, uppgradering, rmsource och rmspec kan tvingas fram"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "filer kan relokeras endast under paketinstallation"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "enbart en av --prefix eller --relocate kan användas"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 "--relocate och --excludepath kan endast användas när nya paket installeras"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix kan endast användas när nya paket installeras"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "argument till --prefix måste börja med /"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) kan enbart användas vid paketinstallation"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent kan enbart användas vid paketinstallation"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles kan enbart användas vid paketinstallation"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs kan enbart användas vid paketinstallation"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs kan enbart användas vid paketinstallation"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs kan enbart användas vid paketinstallation"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr "enbart en av --excludedocs och --includedocs läge kan specifieras"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch kan enbart användas vid paketinstallation"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos kan enbart användas vid paketinstallation"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoresize kan enbart användas vid paketinstallation"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches kan enbart användas när paket tas bort"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles kan enbart användas vid paketinstallation"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 "--justdb kan enbart användas vid installation och avinstallation av paket"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -993,7 +993,7 @@ msgstr ""
 "--noscripts kan enbart användas vid paketinstallation, avinstallation och "
 "verifiering"
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
@@ -1001,7 +1001,7 @@ msgstr ""
 "--notriggers kan enbart användas vid installation, avinstallation och "
 "verifiering"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
@@ -1009,14 +1009,14 @@ msgstr ""
 "--nodeps kan enbart användas vid tillverkning, omtillverkning, "
 "omkompilering, installation, avinstallation, och verifiering"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 "--test kan enbart användas vid installation, avinstallation och tillverkning"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1024,722 +1024,684 @@ msgstr ""
 "--root (-r) kan enbart användas vid installation, avinstallation, förfrågan, "
 "och databasombyggnad"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "argument till --root (-r) måste börja med /"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage kan enbart användas vid paketuppgraderingar"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp kan enbart användas vid signaturkontroll"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nogpg kan enbart användas vid signaturkontroll"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr "--nomd5 kan enbart användas vid signaturkontroll och paketverifiering"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr "inga filer att signera\n"
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr "kan inte komma åt filen %s\n"
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr "pgp hittades inte: "
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr "Ange lösenfras: "
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Kontrollen av lösenfrasen misslyckades\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Lösenfrasen är ok.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr "Felaktig %%_signature spec i makrofil.\n"
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign kan enbart användas vid pakettillverkning"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "oväntade argument till --querytags "
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "inga paket angivna för signaturkontroll"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "inga paket angivna för signering"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "inga paket angivna för avinstallation"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "inga paket angivna för installation"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "extra argument angivna för förfrågan om alla paket"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna för undersökning"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr "extra argument angivna för verifiering av alla paket"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna för verifiering"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr "kan inte öppna paket: %s\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr "argumentet är inte ett RPM-paket\n"
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr "fel vid läsning av pakethuvud\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kan inte återöppna lasten: %s\n"
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 #, fuzzy
 msgid "'<name> <body>'"
 msgstr "   --define '<namn> <kropp>'"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "skriv ut expansionen av makrot <namn> på standard ut"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Användning: %s {--help}\n"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       %s {--initdb}   [--dbpath <kat>]\n"
 
-#: rpmqv.c:299
-#, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+#: rpmqv.c:301
+#, c-format
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       %s {--rebuilddb} [--rcfile <fil>] [--dbpath <kat>]\n"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <fil>] [--ignorearch] [--dbpath <kat>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <fil>]"
-
-#: rpmqv.c:323
-#, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+#: rpmqv.c:325
+#, c-format
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr "       %s {--erase -e} [--root <kat>] [--noscripts] [--rcfile <fil>]\n"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr "                        [--scripts] [--root <kat>] [--rcfile <fil>]"
-
-#: rpmqv.c:337
-#, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+#: rpmqv.c:339
+#, c-format
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr "       %s {--verify -V -y} [-afpg] [--root <kat>] [--rcfile <fil>]\n"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       %s {--setperms} [-afpg] [mål]\n"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       %s {--setugids} [-afpg] [mål]\n"
 
-#: rpmqv.c:346
-#, fuzzy, c-format
+#: rpmqv.c:348
+#, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile <fil>]\n"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [--target=plattform1[,plattform2...]]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr "                        [--rmsource] [--rmspec] spec-fil"
 
-#: rpmqv.c:350
-#, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+#: rpmqv.c:352
+#, c-format
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       %s {--rmsource} [--rcfile <fil>] [-v] spec-fil\n"
 
-#: rpmqv.c:351
-#, fuzzy, c-format
+#: rpmqv.c:353
+#, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--rebuild} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
 
-#: rpmqv.c:352
-#, fuzzy, c-format
+#: rpmqv.c:354
+#, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       %s {--recompile} [--rcfile <fil>] [-v] källa1.rpm ... källaN.rpm\n"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "       %s {--freshen -F} fil1.rpm ... filN.rpm\n"
 
-#: rpmqv.c:357
-#, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+#: rpmqv.c:359
+#, c-format
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "       %s {--resign} [--rcfile <fil>] paket1 paket2 ... paketN\n"
 
-#: rpmqv.c:358
-#, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+#: rpmqv.c:360
+#, c-format
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       %s {--addsign} [--rcfile <fil>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:359
-#, fuzzy, c-format
+#: rpmqv.c:361
+#, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 "       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <fil>]\n"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr "  Alla arbetssätt stödjer följande argument:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr "   --define '<namn> <kropp>'"
 
-#: rpmqv.c:406
-#, fuzzy
-msgid "   --eval '<expr>+'       "
+#: rpmqv.c:408
+msgid "   --eval '<name>+'       "
 msgstr "   --eval '<namn>+'       "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "skriv ut expansionen av makrot <namn> på standard ut"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 msgid "   --pipe <cmd>           "
 msgstr "   --pipe <kommando>      "
 
-#: rpmqv.c:410
-#, fuzzy
-msgid "   --macros <file:...>    "
-msgstr "      --rcfile <fil>      "
-
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
+msgstr "   --rcfile <fil>         "
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr "   --dbpath <kat>         "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr "   --root <kat>           "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   Installera, uppgradera och fråga (med -p) tillåter URL:er att användas"
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr "  istället för filnamn, liksom följande flaggor:"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr "     --ftpproxy <värd>    "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr "     --ftpport <port>     "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr "     --httpproxy <värd>   "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr "     --httpport <port>    "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr "  Flaggor för paketval:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr "fråga om/verifiera alla paket"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr "     -f <fil>+            "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr "fråga om/verifiera paket som äger <fil>"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr "     -p <paketfil>+       "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "fråga om/verifiera (oinstallerat) paket <paketfil>"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr "     --triggeredby <pkt>  "
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr "fråga om/verifiera paket utlösta av <pkt>"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr "     --whatprovides <egenskap>"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr "fråga om/verifiera paket som tillhandahåller <egenskap>"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr "     --whatrequires <egenskap>"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr "fråga om/verifiera paket som behöver <egenskap>"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr "     --queryformat <ffmt> "
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr "    Flaggor för informationsval:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr "visa de egenskaper paketet tillhandahåller"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr "visa de egenskaper paketet behöver"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr "visa de olika [av]installationsskripten"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr "visa utlösningsskripten i paketet"
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "utför inga steg"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr "   --install <paketfil>   "
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr "   -i <paketfil>          "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr "     --excludepath <sökväg>"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr "hoppa över filer med inledande <sökväg>"
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr "kör inte installationsskript"
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "kör inte utlösningsskript utlösta av detta paket"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr "     --prefix <katalog>   "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "     --relocate <frånskv>=<tillskv>"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr "   --upgrade <paketfil>   "
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr "   -U <paketfil>          "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr "   --erase <paket>  "
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr "   -b<steg> <spec>        "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr "   -t<steg> <tar-arkiv>   "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr "paket endast källrpm"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr "     --buildroot <kat>    "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr "     --target=<plattform>+"
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr "   --rebuild <källpaket>  "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr "   --recompile <källpaket>"
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr "   --resign <pkt>+        "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr "   --addsign <pkt>+       "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr "   --checksig <pkt>+"
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr "   -K <pkt>+             "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr "initiera databasen (onödigt, ärvt format)"
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr "bygg om databasindex från existerande databashuvuden"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Använd -e eller --erase istället.\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 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:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 "--notriggers kan enbart användas vid installation och avinstallation av paket"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna för omtillverkning"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "ingen spec-filer angivna för tillverkning"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för tillverkning"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr "Kan inte öppna temporär fil."
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Kör(%s): %s\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "Körning (exec) av %s misslyckades (%s): %s"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr "Dålig slutstatus från %s (%s)"
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr "syntaxfel vid parsning av =="
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr "syntaxfel vid parsning av &&"
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr "syntaxfel vid parsning av ||"
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr "parsfel i uttryck"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr "ensam ("
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr "- endast i tal"
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr "! endast på tal"
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr "typer måste passa ihop"
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr "* / stöds inte för strängar"
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr "- stöds inte för strängar"
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr "&& och || stöds inte för strängar"
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr "syntaxfel i uttryck"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr "TIMECHECK-fel: %s\n"
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr "Saknad \"(\" i %s %s"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "Saknad \")\" i %s(%s"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr "Ogiltig %s token: %s"
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr "Annat än blanktecken följer på %s(): %s"
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "Felaktig syntax: %s(%s)"
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "Felaktig rättighetsspecifikation: %s(%s)"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr "Felaktig specifikation av katalogrättigheter: %s(%s)"
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr "Ovanlig lokallängd: \"%.*s\" i %%langg(%s)"
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr "Duplicerad lokal %.*s i %%lang(%s)"
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr "Slog i gränsen för %%docdir"
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr "Endast ett argument till %%docdir"
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr "Två filer på en rad: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "Filnamn måste börja med \"/\": %s"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr "Kan inte blanda special %%doc med andra former: %s"
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr "Filen uppräknad två gånger: %s"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr "Symbolisk länk pekar på BuildRoot: %s -> %s"
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "Filen matchar inte prefixet (%s): %s"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr "Filen hittades inte: %s"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Felaktig ägare/grupp: %s\n"
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "Fil %4d: %07o %s.%s\t %s\n"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr "Filen behöver inledande \"/\": %s"
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr "Ingen file hittades vid matchningen: %s"
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr "Kunde inte öppna %%files-fil %s: %s"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr "rad: %s"
@@ -1749,7 +1711,7 @@ msgstr "rad: %s"
 msgid "Bad file: %s: %s"
 msgstr "Felaktig fil: %s: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "Felaktig ägare/grupp: %s"
@@ -1775,486 +1737,501 @@ msgstr "%s misslyckades"
 msgid "failed to write all data to %s"
 msgstr "kunde inte skriva all data till %s"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Letar upp %s: (använder %s)...\n"
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr "Misslyckades med att hitta %s:"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Kunde inte kanonisera värdnamn: %s\n"
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "skapande av arkiv misslyckades vid fil %s: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr "cpio_copy kunde inte skriva: %s"
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "cpio_copy kunde inte läsa: %s"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "Kunde inte öppna PreIn-fil: %s"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "Kunde inte öppna PreUn-fil: %s"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "Kunde inte öppna PostIn-fil: %s"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "Kunde inte öppna PostUn-fil: %s"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr "Kunde inte öppna VerifyScript-fil: %s"
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr "Kunde inte öppna Trigger-skriptfil: %s"
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: öppna %s: %s\n"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: läs %s: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s är inte ett RPM-paket\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: läser huvud från %s\n"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr "Felaktig CSA-data"
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr "Genererar signatur: %d\n"
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Kunde inte skriva paket: %s"
 
-#: build/pack.c:445
-#, c-format
-msgid "Generating signature: %d\n"
-msgstr "Genererar signatur: %d\n"
-
-#: build/pack.c:458
+#: build/pack.c:470
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Kan inte läsa signaturen %s: %s"
 
-#: build/pack.c:465
-#, c-format
-msgid "Unable to read sigtarget %s: %s"
-msgstr "Kan inte läsa signaturen %s: %s"
+#: build/pack.c:480
+#, fuzzy, c-format
+msgid "Unable to read header from %s: %s"
+msgstr "Kan inte läsa ikon %s: %s"
 
-#: build/pack.c:471
-#, c-format
-msgid "Unable to write package %s: %s"
+#: build/pack.c:494
+#, fuzzy, c-format
+msgid "Unable to write header to %s: %s"
 msgstr "Kan inte skriva paket %s: %s"
 
-#: build/pack.c:494
+#: build/pack.c:504
+#, fuzzy, c-format
+msgid "Unable to read payload from %s: %s"
+msgstr "Kan inte läsa ikon %s: %s"
+
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "Kan inte skriva paket %s: %s"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr "rad %d: andra %s"
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr "%%changlog-poster måste starta med *"
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr "ofullständig %%changelog-post"
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr "felaktigt datum i %%changelog: %s"
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr "%%changlog är inte i fallande kronologisk ordning"
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr "saknat namn i %%changelog"
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr "ingen beskrivning i %%changelog"
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr "rad %d: Fel i parsning av %%description: %s"
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "rad %d: otillåten flagga %s: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr "rad %d: För många namn: %s"
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "rad %d: Paketet existerar inte: %s"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr "rad %d: En andra beskrivning"
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr "rad %d: Fel i parsning av %%files: %s"
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr "rad %d: En andra %%files-lista"
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr "Arkitekturen är utesluten: %s"
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr "Arkitekturen är inte medtagen: %s"
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr "OS är uteslutet: %s"
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr "OS är inte medtaget: %s"
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr "%s-fält måste finnas med i paketet: %s"
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr "Dubbla %s-poster i paketet: %s"
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "Kan inte öppna ikon %s: %s"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "Kan inte läsa ikon %s: %s"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr "Okänd ikontyp: %s"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr "rad %d: Felaktig tagg: %s"
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr "rad %d: Tom tagg: %s"
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "rad %d: Otillåtet tecken \"-\" i %s: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr "BuildRoot kan inte vara \"/\": %s"
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr "rad %d: Prefix får inte sluta med \"/\": %s"
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "rad %d: Docdir måste börja med \"/\": %s"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "rad %d: Epoch/Serial-fält måste vara numeriskt: %s"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "rad %d: Felaktigt %s-tal: %s\n"
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "rad %d: Felaktig BuildArchitecture-format: %s"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr "Internt fel: felaktig tagg %d"
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr "Felaktig paketspecifikation: %s"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr "Paketet existerar redan: %s"
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr "rad %d: Okänd tagg: %s"
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr "Spec-fil kan inte använda BuildRoot"
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr "Dålig källa: %s: %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr "Inget patch-nummer %d"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr "Inget källkodsnummer %d"
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "Kunde inte hämta nosource %s: %s"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr "Fel i parsning av %%setup: %s"
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr "rad %d: Felaktigt argument till %%setup %c: %s"
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr "rad %d: Felaktig %%setup-flagga %s: %s"
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr "rad %d: Behöver argument till %%patch -b: %s"
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr "rad %d: Behöver argument till %%patch -z: %s"
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr "rad %d: Behöver argument till %%patch -p: %s"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr "rad %d: Felaktigt argument till %%patch -p: %s"
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr "För många patchar!"
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr "rad %d: Felaktigt argument till %%patch: %s"
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr "rad %d: andra %%prep"
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "rad %d: Beroenden måste börja alfanumeriskt, med \"_\" eller \"/\": %s"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "rad %d: Filnamn inte tillåtna: %s"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "rad %d: Versionsfilnamn inte tillåtet: %s"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr "rad %d: Version krävs: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr "rad %d: utlösare måste ha --: %s"
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr "rad %d: Fel vid parsning av %s: %s"
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr "rad %d: skriptprogram måste börja med \"/\": %s"
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr "rad %d: En andra %s"
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr "rad %d: %s"
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr "Oavslutat %%if"
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr "%s:%d: parseExpressionBoolean returnerar %d"
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr "%s:%d: Fick ett %%else utan något if"
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr "%s:%d: Fick ett %%endif utan något if"
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr "felformaterad %%include-sats"
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr "Inga byggbara arkitekturer"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr "Paketet har ingen %%description: %s"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr "arkiv = %s, fs = %s\n"
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr "rad %d: Felaktigt tal: %s"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr "rad %d: Felaktigt no%s-tal: %d"
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "rad %d: Felaktigt %s-tal: %s\n"
@@ -2269,184 +2246,184 @@ msgstr "kan inte flytta %s till %s: %s\n"
 msgid "can't unlink %s: %s\n"
 msgstr "kan inte ta bort %s: %s\n"
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr "getNextHeader: %s\n"
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr "(fel 0x%x)"
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr "Felaktigt magiskt tal"
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr "Felaktigt/oläsbart huvud"
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr "Huvudstorlek för stor"
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr "Okänd filtyp"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr "Saknad hårdlänk"
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr " misslyckades - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
-"\"B\"-beroendet beghöver en epok (antar samma som \"A\")\n"
-"        A %s    B %s\n"
+"\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
+"\tA %s\tB %s\n"
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s JA (lade till filer)\n"
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s JA (lade till tillhandahållande)\n"
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr "%s: %-45s %-3s (cachad)\n"
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tillhandahållande)\n"
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s står i konflikt: %s\n"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tar bort \"%s\" från %s-indexet.\n"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr "db%d fel(%d)"
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr " utför %s"
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr "stängde  db fil        %s\n"
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr "tog bort db-fil        %s\n"
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr "felaktig db-fil %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "öppnar db-fil          %s rättighet 0x%x\n"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kan inte få %s lås på databas"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "delat"
 
@@ -2475,57 +2452,57 @@ msgstr "stängde  db-index      %s/%s(%s)\n"
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr "öppnar   db-index      %s/%s(%s) %s mod=0x%x\n"
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr "dbiSetConfig: okänd db-flagga: \"%s\" ignorerad\n"
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr "%s har ogiltigt ogiltigt numeriskt värde, hoppar över\n"
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr "%s har för stort eller för litet \"long\"-värde, hoppar över\n"
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr "%s har för stort eller för litet heltalsvärde, hoppar över\n"
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr "stängde  db-miljö      %s/%s\n"
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr "tar bort db-miljö      %s/%s\n"
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr "öppnar   db-miljö      %s/%s %s\n"
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr "tog bort db-index      %s/%s\n"
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "öppnar   db-index      %s/%s %s rättighet=0x%x\n"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan inte få %s lås på %s/%s\n"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr "låste    db-index      %s/%s\n"
@@ -2546,125 +2523,112 @@ msgstr ""
 "problemet.\n"
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(inte ett tal)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr "mntctl() kunde inte returnera fugger-storlek: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr "kunde inte ta status på %s: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr "hämtar lista över monterade filsystem\n"
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "kunde inte öppna %s: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr "filen %s är på en okänd enhet"
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
+#, fuzzy
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE måste vara 1.\n"
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Felaktigt antal till headerAddEntry(): %d\n"
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "{ fattas efter %"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "} fattas efter %{"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "tomt taggformat"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "tomt taggnamn"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "okänd tagg"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "] förväntades vid slutet på vektor"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "oväntad ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "oväntad }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "? förväntades i uttryck"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr "{ förväntades efter ? i uttryck"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "} förväntades i uttryck"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ": förväntades efter ? i deluttryck"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr "{ förväntades efter : i uttryck"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "| förväntades vid slutet på uttryck"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(okänd typ)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr "   fil: %s åtgärd: %s\n"
@@ -2679,549 +2643,548 @@ msgstr "användaren %s finns inte - använder root"
 msgid "group %s does not exist - using root"
 msgstr "gruppen %s finns inte - använder root"
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr "%%instchangelog-värde i makrofil skall vara ett tal, men är inte det"
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr "uppackning av arkiv misslyckades%s%s: %s"
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr "installerar källpaket\n"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr "kan inte skapa källkatalog %s"
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr "kan inte skriva till %s"
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr "källkod i: %s\n"
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr "kan inte skapa spec-katalog %s"
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr "spec-fil i: %s\n"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr "källpaket innehåller ingen spec-fil"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr "byter namn på %s till %s\n"
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "namnbyte från %s till %s misslyckades: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr "källpaket förväntades, fann binärpaket"
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "paket: %s-%s-%s filtest = %d\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr "avbryter installation eftersom vi kör --test\n"
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr "kör (eventuellt) preinstalltionsskript\n"
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr "varning: %s skapades som %s"
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr "varning: %s sparades som %s"
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr "kör (eventuellt) postinstallationsskript\n"
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "fel när tämporärfil %s skapades"
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM"
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr "buildroot redan specificerad"
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr "bygg till och med %%prep-steget från spec-fil"
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr "bygg till och med %%build-steget från spec-fil"
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr "bygg till och med %%install-steget från spec-fil"
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr "verifiera %%files-sektionen i spec-fil"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr "bygg käll- och binärpaket från spec-fil"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr "bygg binärpaket från spec-fil"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr "bygg källpaket från spec-fil"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr "bygg till och med %%prep-steget från tar-arkiv"
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr "bygg till och med %%build-steget från tar-arkiv"
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr "bygg till och med %%install-steget från tar-arkiv"
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr "verifiera %%files-sektionen från tar-arkiv"
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr "bygg käll- och binärpaket från tar-arkiv"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr "bygg binärpaket från tar-arkiv"
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr "bygg källpaket från tar-arkiv"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr "bygg binärpaket från källpaket"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr "bygg till och med %%install-steget från källpaket"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr "åsidosätt tillverkningsrot"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr "utför inga steg i tillverkningen"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr "acceptera inte översatta \"msgstr\" från spec-filen"
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr "ta bort spec-fil efteråt"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr "åsidosätt målplattform"
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr "slå upp översatta strängar i spec-fil katalog"
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr "fråga om/verifiera paket som äger fil"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr "fråga om/verifiera paket i grupp"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr "fråga om/verifiera en paketfil"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr "rpm frågeläge"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr "visa kända frågetaggar"
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr "fråga om en spec-fil"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr "undersök paket utlösta av paketet"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr "rpm verifieringsläge"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr "rpm verifieringsläge (ärvt)"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr "fråga om paket som behöver en egenskap"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr "fråga om paket som tillhandahåller en egenskap"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr "lista alla konfigurationsfiler"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr "lista alla dokumentationsfiler"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr "visa filinformation"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr "lista filer i paketet"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr "använd följande frågeformat"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr "ersätt översatta sektioner till spec-fil"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr "visa tillstånd för de listade filerna"
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr "visa en utförlig fillistning"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " behövs av %s-%s-%s\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " står i konflikt med %s-%s-%s\n"
 
-#: lib/problems.c:103
-#, c-format
-msgid "package %s-%s-%s is for a different architecture"
+#: lib/problems.c:99
+#, fuzzy, c-format
+msgid "package %s is for a different architecture"
 msgstr "paket %s-%s-%s är för en annan arkitektur"
 
-#: lib/problems.c:108
-#, c-format
-msgid "package %s-%s-%s is for a different operating system"
+#: lib/problems.c:103
+#, fuzzy, c-format
+msgid "package %s is for a different operating system"
 msgstr "paket %s-%s-%s är för ett annat operativsystem"
 
-#: lib/problems.c:113
-#, c-format
-msgid "package %s-%s-%s is already installed"
+#: lib/problems.c:107
+#, fuzzy, c-format
+msgid "package %s is already installed"
 msgstr "paket %s-%s-%s är redan installerat"
 
-#: lib/problems.c:118
-#, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
-msgstr "sökväg %s är inte relokerbar för paket %s-%s-%s"
+#: lib/problems.c:111
+#, fuzzy, c-format
+msgid "path %s in package %s is not relocateable"
+msgstr "paket %s är inte relokerbart\n"
 
-#: lib/problems.c:123
-#, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+#: lib/problems.c:116
+#, fuzzy, c-format
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 "filen %s är en konflikt mellan installationsförsök av %s-%s-%s och %s-%s-%s"
 
-#: lib/problems.c:129
-#, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+#: lib/problems.c:121
+#, fuzzy, c-format
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "filen %s från installation av %s-%s-%s står i konflikt med filen från paket "
 "%s-%s-%s"
 
-#: lib/problems.c:135
-#, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+#: lib/problems.c:126
+#, fuzzy, c-format
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s (som är nyare än %s-%s-%s) är redan installerat"
 
-#: lib/problems.c:141
-#, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+#: lib/problems.c:131
+#, fuzzy, c-format
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "installation av paket %s-%s-%s kräver %ld%cb på filsystem %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, fuzzy, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "installation av paket %s-%s-%s kräver %ld%cb på filsystem %s"
 
-#: lib/problems.c:158
-#, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+#: lib/problems.c:146
+#, fuzzy, c-format
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paket %s-%s-%s systemanrop före transaktion: %s misslyckades: %s"
 
-#: lib/problems.c:166
-#, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+#: lib/problems.c:153
+#, fuzzy, c-format
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr "okänt fel %d uppträdde under manipulation av paket %s-%s-%s"
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "fel i format: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(innehåller inga filer)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr "ersatt        "
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr "oinstallerat  "
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr "nätdelad      "
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(okänd %3d)   "
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr "(ej tillstnd) "
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr "paketet har varken filägare eller id-listor"
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kan inte fråga om %s: %s\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades öppna %s: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "källpaket i gammalt format går ej att fråga om\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s verkar inte vara ett RPM-paket\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "fråga om %s misslyckades\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "fråga om spec-fil %s misslyckades, kan inte parsa\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr "inga paket\n"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupp %s innehåller inga paket\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "inga paketutlösare %s\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "inget paket behöver %s\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandahåller %s\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
-msgstr "filen %s ägs inte av något paket\n"
+msgstr "filen %s tillhör inget paket\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "post %d kunde inte läsas\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: open misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile misslyckades\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Kan inte signera v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Kan inte signera om v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature misslyckades\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillgänglig\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr "OK"
 
@@ -3319,7 +3282,7 @@ msgstr "fel(%d) när post %s sparades i %s"
 msgid "error(%d) removing record %s from %s"
 msgstr "fel(%d) när post %s togs bort ur %s"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
@@ -3332,512 +3295,507 @@ msgstr ""
 "i nytt format"
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr "fel(%d) när paket räknades"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%s: kan inte läsa huvud vid 0x%x"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "tar bort 0 %s-poster.\n"
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" från %s-indexet.\n"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "tar bort %d poster från %s-indexet.\n"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "fel(%d) vid allokering av ny paketinstans"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr "lägger till 0 %s-poster.\n"
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "lägger till \"%s\" till %s-indexet.\n"
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "lägger till %d poster till %s-indexet.\n"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tillfällig databas %s existerar redan"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "fel när katalog skapades %s: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas med dbapi %d\n"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "post nummer %d i databasen är felaktig -- hoppar över den."
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kan inte lägga till post ursprungligen vid %d"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer från %s för att återställa"
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "inga paket angivna för installation"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr "räknar paket att installera\n"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr "hittade %d paket\n"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr "letar efter paket att hämta\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "hoppar över %s - rpmGlob misslyckades(%d)\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Hämtar %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hoppar över %s - överföring misslyckades - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "hämtade %d paket\n"
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan inte öppna filen %s: %s\n"
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte öppna paketdatabas i %s\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s är inte relokerbart\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fel vid läsning från fil %s\n"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "filen %s behöver en nyare version av RPM\n"
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d käll- och %d binärpaket\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "ouppfyllda beroenden:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr "installerar binärpaket\n"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "kan inte öppna %s/packages.rpm\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" anger flera paket\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "läsning misslyckades: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "andra \":\" saknas vid %s:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "arkitekturnamn saknas vid %s:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "Ofullständig datarad vid %s:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "För många argument i datarad vid %s:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Felaktigt arkitektur-/osnummer: %s (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "Ofullständig skönsfallsrad vid %s:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "För många argument i skönsfallsrad vid %s:%d"
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr "Kan inte expandera %s"
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr "Kan inte läsa %s, HOME är för stor."
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "Kan inte öppna %s för läsning: %s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "Misslyckades med att läsa %s: %s."
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "\":\" saknas (hittade 0x%02x) vid %s:%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "argument till %s saknas vid %s:%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
-msgstr "%s expansion misslyckade vid %s:%d \"%s\""
+msgstr "%s expansion misslyckades vid %s:%d \"%s\""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "kan inte öppna %s vid %s:%d: %s"
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "arkitektur saknas för %s vid %s:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "okänd flagga \"%s\" vid %s:%d"
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr "Okänt system: %s\n"
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Var god kontakta rpm-list@redhat.com\n"
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr "sigstorlek       : %d\n"
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
-msgstr "Huvud + Arkiv    : %d\n"
+msgid "file is not regular -- skipping size check\n"
+msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
-msgstr "förväntad storlek: %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
+msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
-msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
+#: lib/signature.c:123
+#, fuzzy, c-format
+msgid "  Actual size: %12d\n"
+msgstr "Signaturstorlek  : %d\n"
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr "Gammal PGP-signatur\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Gammal (endast intern) signatur!  Hur fick du tag i den!?"
 
-#: lib/signature.c:157
-msgid "New Header signature\n"
-msgstr "Ny huvudsignatur\n"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr "Signaturstorlek  : %d\n"
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr "Signaturutfyllnad: %d\n"
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "Kunde inte köra pgp (%s)"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "pgp misslyckades"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "pgp misslyckades att skriva en signatur"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP signaturstorlek: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "kan inte läsa signaturen"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fick %d byte PGPsignatur\n"
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr "Kunde inte köra gpg"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr "gpg misslyckades"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr "gpg kunde inte skriva signatur"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG signaturstorlek: %d\n"
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fick %d byte GPGsignatur\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr "Genererar signatur med PGP.\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr "Genererar signatur med GPG.\n"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "Kunde inte köra pgp.  Använd --nopgp för att hoppa över PGPkontroll."
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr "exec misslyckades!\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "Kunde inte köra gpg.  Använd --nogpg för att hoppa över GPGkontroll."
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "Kunde inte köra pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr "Ogiltig %%_signature specifikation i makrofil"
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "Du måste sätta \"%%_gpg_name\" i din makrofil"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr "hoppar över %s%s\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad på grund av missingok-flagga\n"
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "kan inte ta bort %s - katalogen är inte tom"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "rmdir av %s misslyckades: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
-msgstr "borttagning av %s misslyckades: %s"
+msgstr "kan inte ta bort %s: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr "tar bort filer test = %d\n"
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr "kör (eventuellt) postavinstallationsskript\n"
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "körning av skript från %s-%s-%s misslyckades, slutstatus %d"
@@ -3866,218 +3824,224 @@ msgstr "saknas     %s\n"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr "Lyckades"
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr "Konstigt svar från server"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr "IO-fel mot server"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr "Förbindelsen med servern dog ut (timeout)"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr "Kunde inte slå upp serverns adress"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr "Kunde inte slå upp serverns namn"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr "Misslyckades med att kontakta servern"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr "Misslyckades med att etablera en dataförbindelse till servern"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "IO-fel mot lokal fil"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Fel när den fjärrservern sattes i passivt läge"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Filen fanns inte på servern"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr "Avbruten under gång"
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr "Okänt eller oväntat fel"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "loggar in på %s som %s, lösenord %s\n"
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiva %d tomma %d\n"
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr "%3d>%*s(tom)"
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr "Makro %%%s har oavslutad kropp"
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr "Makro %%%s har otillåtet namn (%%define)"
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr "Makro %%%s har oavslutade flaggor"
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr "makro %%%s har tom kropp"
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr "Makro %%%s misslyckades att expandera"
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr "Makro %%%s har otillåtet namn (%%undefine)"
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr "Makro %%%s (%s) var inte använd under nivå %d"
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr "Okänd flagga %c i %s(%s)"
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr "Rekursionsdjup(%d) större än max(%d)"
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr "Oavslutad %c: %s"
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr "Ett %% följs av ett makro som inte kan parsas"
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr "Inget makro %%%.*s hittat, hoppar över"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr "Målbuffer översvämmad"
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr "Fil %s: %s"
 
-#: rpmio/macro.c:1503
-#, c-format
-msgid "File %s is smaller than %d bytes"
+#: rpmio/macro.c:1501
+#, fuzzy, c-format
+msgid "File %s is smaller than %u bytes"
 msgstr "Filen %s är mindre än %d byte"
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "(fel 0x%x)"
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "fatalt fel: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "fel: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "varning: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr "minnesallokering (%u byte) returnerade NULL.\n"
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr "varning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr "varning: u %p data %p nrefs != 0 (%s %s)\n"
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr "varning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Lösenord för %s@%s: "
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr "fel: %s-port måste vara ett tal\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr "url-port måste vara ett tal\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
-#~ msgid "undefined identifier"
-#~ msgstr "odefinierad identifierare"
+#~ msgid "sigsize         : %d\n"
+#~ msgstr "sigstorlek       : %d\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "cirkularitet i kedja av förutsättningar: %s"
+#~ msgid "Header + Archive: %d\n"
+#~ msgstr "Huvud + Arkiv    : %d\n"
+
+#~ msgid "expected size   : %d\n"
+#~ msgstr "förväntad storlek: %d\n"
+
+#~ msgid "New Header signature\n"
+#~ msgstr "Ny huvudsignatur\n"
 
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "   --rcfile <fil>         "
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "sökväg %s är inte relokerbar för paket %s-%s-%s"
 
 #~ msgid "RPMERR_INTERNAL: Hit limit in getUname()\n"
 #~ msgstr "RPMERR_INTERNAL: Slog i begränsning i getUname()\n"
@@ -4087,3 +4051,12 @@ msgstr "kunde inte skapa %s: %s\n"
 
 #~ msgid "internal error (rpm bug?): "
 #~ msgstr "internt fel (fel i rpm?): "
+
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "Kan inte läsa signaturen %s: %s"
+
+#~ msgid "undefined identifier"
+#~ msgstr "odefinierad identifierare"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "cirkularitet i kedja av förutsättningar: %s"
diff --git a/po/tr.po b/po/tr.po
index 37d1ccc1a..4c374b1d4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,65 +14,65 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, fuzzy, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr "hata: %s%s/packages.rpm açılamıyor\n"
 
-#: build.c:35
+#: build.c:36
 #, fuzzy
 msgid "failed build dependencies:\n"
 msgstr "bağımlılık hatası, aşağıdaki paketlere ihtiyacınız var:\n"
 
-#: build.c:64
+#: build.c:65
 #, fuzzy, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr "%s okuma erişimi için açılamadı:%s."
 
 # , c-format
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, fuzzy, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr "%s 'ye erişimde hata oluştu\n"
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, fuzzy, c-format
 msgid "Failed to read spec file from %s"
 msgstr "%s okunamadı: %s"
 
-#: build.c:172
+#: build.c:177
 #, fuzzy, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr "%s okunamadı: %s"
 
-#: build.c:211
+#: build.c:216
 #, fuzzy, c-format
 msgid "failed to stat %s: %m"
 msgstr "%s açılamadı: %s"
 
-#: build.c:216
+#: build.c:221
 #, fuzzy, c-format
 msgid "File %s is not a regular file."
 msgstr "%s bir RPM paketi değil (gibi)\n"
 
-#: build.c:224
+#: build.c:229
 #, fuzzy, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr "%s bir RPM paketi değil (gibi)\n"
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, fuzzy, c-format
 msgid "Building for target %s\n"
 msgstr "%s paketi bulunamadı\n"
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
@@ -90,460 +90,460 @@ msgstr ""
 # May 5, 1998 
 #
 # , c-format
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr "RPM Sürüm %s\n"
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr "Bu ğrogram GNU GPL uyarınca serbestçe dağıtılabilir."
 
-#: rpm.c:208
+#: rpm.c:209
 #, fuzzy
 msgid "Usage: rpm {--help}"
 msgstr "Kullanım: rpm {--help}"
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr "       rpm {--version}"
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr "       rpm {--initdb}   [--dbpath <dizin>]"
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 "                        [--replacepkgs] [--replacefiles] [--root <dizin>]"
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr "                        [--excludedocs] [--includedocs] [--noscripts]"
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 "                        [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 "                        [--prefix <dizin>] [--ignoreos] [--nodeps] "
 "[--allfiles]"
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 #, fuzzy
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate eskidizin=yenidizin]"
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 #, fuzzy
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr "                        [--oldpackage] [--root <dizin>] [--noscripts]"
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 "                        [--excludedocs] [--includedocs] [--rcfile <dosya>]"
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 "                        [--ignorearch]  [--dbpath <dizin>] [--prefix "
 "<dizin>] "
 
-#: rpm.c:226
+#: rpm.c:227
 #, fuzzy
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr "                        [--ftpproxy <sunucu>] [--ftpport <port>]"
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr "                        [--noorder] [--relocate eskidizin=yenidizin]"
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 #, fuzzy
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 #, fuzzy
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "                        [--scripts] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 #, fuzzy
 msgid "                        [--triggeredby]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 #, fuzzy
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 "                        [--dbpath <dizin>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 #, fuzzy
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 "                        [--dbpath <dizin>] [--nodeps] [--nofiles] "
 "[--noscripts]"
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr "                        [--nomd5] [targets]"
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr "       rpm {--setperms} [-afpg] [target]"
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr "       rpm {--setugids} [-afpg] [target]"
 
-#: rpm.c:244
+#: rpm.c:245
 #, fuzzy
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 "       rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr "                        [--dbpath <dizin>] [--nodeps] [--allmatches]"
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 #, fuzzy
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr "                        [--justdb] paket1 ... paketN"
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--resign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpm.c:250
+#: rpm.c:251
 #, fuzzy
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr "                           paket1 ... paketN"
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr "       rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr "       rpm {--querytags}"
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 #, fuzzy
 msgid "Usage:"
 msgstr "Kullanım:"
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr "Bu bilgiyi verir"
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr "Kullanılan RPM sürümünü verir"
 
-#: rpm.c:294
+#: rpm.c:295
 #, fuzzy
 msgid "   All modes support the following arguments:"
 msgstr "   tüm kipler aşağıdaki argümanları kabul ederler:"
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 #, fuzzy
 msgid "    --eval '<name>+'      "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 #, fuzzy
 msgid "print the expansion of macro <name> to stdout"
 msgstr "Kullanılan RPM sürümünü verir"
 
-#: rpm.c:299
+#: rpm.c:300
 #, fuzzy
 msgid "    --pipe <cmd>          "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr "standart çıktıyı <KOMUT>'a gönderir"
 
-#: rpm.c:301
+#: rpm.c:302
 #, fuzzy
 msgid "    --rcfile <file>       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr "/etc/rpmrc ve $HOME/.rpmrc yerine <dosya> kullanın"
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr "daha çok açıklama verir"
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr "çok fazla açıklama verir (hata ayıklama için)"
 
-#: rpm.c:311
+#: rpm.c:312
 #, fuzzy
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 "   yükleme, güncelleme ve sorgulama (-p ile) işlemlerimde dosya isimleri "
 
-#: rpm.c:312
+#: rpm.c:313
 #, fuzzy
 msgid "   of file names as well as the following options:"
 msgstr "   yerine FTP adreslerini aşağıdaki seçeneklerle kabul eder:\n"
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr "Makina ismi veya FTP-Proxy'nin IP numarası"
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr "FTP sunucusunun (ya da Proxy'nin) port numarası"
 
-#: rpm.c:317
+#: rpm.c:318
 #, fuzzy
 msgid "      --httpproxy <host>  "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 #, fuzzy
 msgid "hostname or IP of http proxy"
 msgstr "Makina ismi veya FTP-Proxy'nin IP numarası"
 
-#: rpm.c:319
+#: rpm.c:320
 #, fuzzy
 msgid "      --httpport <port>   "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 #, fuzzy
 msgid "port number of http server (or proxy)"
 msgstr "FTP sunucusunun (ya da Proxy'nin) port numarası"
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr "Sorgulama kipi"
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 #, fuzzy
 msgid "      --dbpath <dir>      "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr "Veritabanı dizini olarak <dizin> kullanılır"
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 #, fuzzy
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr "'header format' olarak s kullanılır (-i'yi gerektirir)"
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr "kök (başlangıç) dizini olarak <dizin> kullanılır"
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr "      Paket seçim seçenekleri:"
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr "Tüm paketleri sorgulama"
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr "(henüz yüklenmemiş) <paket dosyası> paketi sorgulama"
 
-#: rpm.c:338
+#: rpm.c:339
 #, fuzzy
 msgid "        --triggeredby <pkg>"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: rpm.c:339
+#: rpm.c:340
 #, fuzzy
 msgid "query packages triggered by <pkg>"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: rpm.c:340
+#: rpm.c:341
 #, fuzzy
 msgid "        --whatprovides <cap>"
 msgstr "        --requires"
 
-#: rpm.c:341
+#: rpm.c:342
 #, fuzzy
 msgid "query packages which provide <cap> capability"
 msgstr "<i> yeteneği olan paketleri sorgulama"
 
-#: rpm.c:342
+#: rpm.c:343
 #, fuzzy
 msgid "        --whatrequires <cap>"
 msgstr "        --requires"
 
-#: rpm.c:343
+#: rpm.c:344
 #, fuzzy
 msgid "query packages which require <cap> capability"
 msgstr "<i> yeteneğine ihtiyaç duyan paketleri sorgulama"
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr "      Bilgilendirme seçenekleri:"
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr "Paket bilgisini gösterme"
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr "Paketin 'Change Log' (değişiklik) bilgisini gösterme"
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr "Paketin içerdiği dosyaları gösterme"
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr "dosyaların durumunu gösterir (-l gerektirir)"
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr "sadece belge dosyalarını gösterir (-l gerektirir)"
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 "sadece yapılandırma (configuration) dosyalarını gösterir (impliziert -l)"
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -551,183 +551,183 @@ msgstr ""
 "her dosya için doğrulanabilir bilgileri göster (-l, -c veya -d ile "
 "kullanılmalı)"
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr "paketin sağladığı yetenekleri sıralar"
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr "paketin bağımlılıklarını (gerektirdiği paketleri) gösterir"
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr "paketin çeşitli yükleme, silme betiklerini (scripts) gösterir"
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr "paketi -q ile belirtilen paket parametrelerini kullanarak doğrula"
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr "paket bağımlılıklarını doğrulamaz"
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr "dosyaların 'md5-checksum' larını doğrulamaz"
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr "dosya özelliklerini doğrulamaz"
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr "sorgulama sırasında kullanılabilecek 'Tag'leri sıralar"
 
-#: rpm.c:385
+#: rpm.c:386
 #, fuzzy
 msgid "    --install <packagefile>"
 msgstr "paket yüklemek"
 
-#: rpm.c:386
+#: rpm.c:387
 #, fuzzy
 msgid "    -i <packagefile>      "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr "paket yüklemek"
 
-#: rpm.c:388
+#: rpm.c:389
 #, fuzzy
 msgid "      --excludepath <path>"
 msgstr "dosyaları <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 #, fuzzy
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr "dosyaları <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr "dosyaları <eskidizin> den <yenidizin> e relocate et"
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 #, fuzzy
 msgid "relocate files in non-relocateable package"
 msgstr "%s pakedi yüklenmemiş\n"
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr "paketin yerini (eğer değitirilebiliyorsa) <dizin>'e değiştirir"
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr "yazılımın belgelerini yüklemez"
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr "--replacepkgs --replacefiles'ın kısaltması"
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr "yükleme sırasında bir gösterge çıkarır (-v seçeneği ile iyi)"
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 "tüm dosyaları, hatta normal olarak atlanabilecek yapılandırmaları bile,yükler"
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr "paket mimarisini doğrulamaz"
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr "paketin ait olduğu işletim sistemini doğrulamaz"
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr "paket ile gelen belgeleri de yükler"
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr "veri tabanını günceller, ama dosya sistemini değiştirmez"
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr "paket yükleme sırasını bağımlılıklara göre düzenleme"
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr "yükleme betiklerini (scripts) çalıştırmaz."
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr "yükleme sırasında gelişme yüzde olarak gösterilir"
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr "paket mevcut dosyaları silse bile paketi yükler"
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr "paket mevcutsa yeniden yükler"
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr "yükleme yapmaz, sadece çalışıp çalışmayacağını belirtir"
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 #, fuzzy
 msgid "    -U <packagefile>      "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr "Paketi günceller (seçenekler --install ile aynı, ek olarak)"
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 "pakedin eski bir sürüme güncellenmesini sağlar (--force aynı işi görür)"
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr "paketi siler (uninstall)"
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
@@ -735,111 +735,111 @@ msgstr ""
 "<paket> ile eşlenen tüm paketleri siler (birden fazla paket eşlenirse bir "
 "hata mesajı çıkması gerekir)"
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr "pakete ait hiçbir betik (Script) çalıştırılmaz"
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:464
+#: rpm.c:465
 #, fuzzy
 msgid "    -t<stage> <tarball>   "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr "paket yaratır, <adım> aşağıdaki harflerden biridir:"
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr "hazırlama (kaynaklar açılır ve yamalar uygulanır)"
 
 # , c-format
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr "kontrol ( %files üstünkörü bir kontrol edilir)"
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr "derleme (hazırlama ve derleme)"
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr "yükleme (hazırlama, derleme, yükleme)"
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 "çalıştırılabilir paket yaratma (hazırlama, derleme, yükleme, paketleme)"
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 "çalıştırılabilir ve Kaynak paket yaratmak (hazırlama, derleme, yükleme "
 "vepaketleme)"
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr "doğrudan belirtilen adıma atlar (sadece c ve i için)"
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr "işlem sonunda paket yaratma yapısını siler"
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 #, fuzzy
 msgid "remove sources when done"
 msgstr "işlem sonunda kaynakları ve spec dosyasını siler"
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 #, fuzzy
 msgid "remove spec file when done"
 msgstr "işlem sonunda kaynakları ve spec dosyasını siler"
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 #, fuzzy
 msgid "generate PGP/GPG signature"
 msgstr "PGP-imzası yaratır"
 
-#: rpm.c:488
+#: rpm.c:489
 #, fuzzy
 msgid "      --buildroot <dir>   "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr "paket yaratılırken <dizin> başlangıç dizini olarak kullanılır"
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr "adımların hiçbirini çalıştırmaz"
 
-#: rpm.c:494
+#: rpm.c:495
 #, fuzzy
 msgid "      --timecheck <secs>  "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:495
+#: rpm.c:496
 #, fuzzy
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr "zaman kontrolünü S saniyeye ayarlar (0 ile tümüyle kaldırır)"
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
@@ -847,68 +847,68 @@ msgstr ""
 "kaynak paketini yükler, çalışır paketi oluşturur ve spec dosyası, kaynaklar "
 "ile yamaları siler"
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr "--rebuild gibi, ama paket yaratmaz"
 
-#: rpm.c:503
+#: rpm.c:504
 #, fuzzy
 msgid "    --resign <pkg>+       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr "paketi imzalar (mevcut imza kaldırılır)"
 
-#: rpm.c:505
+#: rpm.c:506
 #, fuzzy
 msgid "    --addsign <pkg>+      "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr "pakete bir imza ekler"
 
-#: rpm.c:507
+#: rpm.c:508
 #, fuzzy
 msgid "    --checksig <pkg>+"
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:508
+#: rpm.c:509
 #, fuzzy
 msgid "    -K <pkg>+             "
 msgstr "    -b<adım> <spec>      "
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr "paket imzasını doğrular"
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr "tüm PGP imzalarını atlar"
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 #, fuzzy
 msgid "skip any GPG signatures"
 msgstr "tüm PGP imzalarını atlar"
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr "tüm MD5 imzalarını atlar"
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr "geçerli bir veri tabanı olmasını sağlar"
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr "mevcut veritabanını kullanılarak veritabınını yeniden oluşturur"
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
@@ -916,7 +916,7 @@ msgstr ""
 "dosya erişim haklarını veri tabanında yer alanlarla -q ile belirtilen paket "
 "parametrelerini kullanarak güncelle"
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
@@ -924,157 +924,157 @@ msgstr ""
 "dosya kullanıcı ve grup bilgilerini veri tabanında yer alanlarla -q ile "
 "belirtilen paket parametrelerini kullanarak güncelle"
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr "sadece bir ana kip (major mode) belirtilebilir"
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr "-u ve --uninstall komutları eskidirler ve çalışmamaktadırlar.\n"
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr "Yerine  -e veya --erase komutunu kullanın\n"
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr "relocate işlemi / ile başlamalı"
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr "relocate satırında = bulunmalı"
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr "relocate için = den sonra bir / gerekir"
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 #, fuzzy
 msgid "exclude paths must begin with a /"
 msgstr "relocate işlemi / ile başlamalı"
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr "bir anda sadece bir tarz sorgulama veya doğrulama yapılabilir"
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 #, fuzzy
 msgid "unexpected query flags"
 msgstr "beklenmeyen sorgulama kaynağı girildi"
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 #, fuzzy
 msgid "unexpected query format"
 msgstr "beklenmeyen sorgulama kaynağı girildi"
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr "beklenmeyen sorgulama kaynağı girildi"
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 #, fuzzy
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr "sadece yükleme ve güncelleme zorlanabilir (force edilebilir)"
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr "dosyalar sadece paket yüklemesi sırasında relocate edilebilir"
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr "--prefix ve --relocate seçeneklerinden sadece biri kullanılabilir"
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 #, fuzzy
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr "--relocate sadece yeni paketler yüklenirken kullanılır"
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr "--prefix sadece yeni paketlerin yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr "--prefix komutunun argümanları '/' ile başlamalı"
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr "--hash (-h) sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr "--percent sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr "--replacefiles sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr "--replacepkgs sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr "--excludedocs sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr "--includedocs sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 "--excludedocs ve --includedocs bir arada kullanılamaz (bi daha olmasın)"
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr "--ignorearch sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr "--ignoreos sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 #, fuzzy
 msgid "--ignoresize may only be specified during package installation"
 msgstr "--ignoreos sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr "--allmatches sadece paket silinmesi sırasında kullanılabilir"
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr "--allfiles sadece paket yüklenmesi sırasında kullanılabilir"
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr "--justdb sadece paket yükleme ve silmelerinde kullanılır"
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr "--noscripts sadece paket yükleme, silme ve doğrulamalarında kullanılır"
 
-#: rpm.c:916
+#: rpm.c:917
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
@@ -1082,7 +1082,7 @@ msgid ""
 msgstr ""
 "--nodeps sadece paket yüklemelerinde, silme ve doğrulamalarda kullanılır"
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
@@ -1090,13 +1090,13 @@ msgid ""
 msgstr ""
 "--nodeps sadece paket yüklemelerinde, silme ve doğrulamalarda kullanılır"
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr "--test sadece paket yüklemelerinde, silme ve derlemelerinde kullanılır"
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
@@ -1104,789 +1104,752 @@ msgstr ""
 "--root (-r) sadece yükleme, silme, sorgulama ve veritabanı güncellemelerinde "
 "kullanılır"
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr "--root (-r) komutun argümanları '/' ile başlamalı"
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr "--oldpackage sadece güncelleme sırasında kullanılabilir"
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr "--nopgp sadece İmza kontrolü sırasında kullanılabilir"
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 #, fuzzy
 msgid "--nogpg may only be used during signature checking"
 msgstr "--nopgp sadece İmza kontrolü sırasında kullanılabilir"
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 #, fuzzy
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 "--nopgp sadece imza kontrolü veya paket doğrulaması sırasında kullanılır"
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, fuzzy, c-format
 msgid "cannot access file %s\n"
 msgstr "%s dosyası açılamıyor: "
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 #, fuzzy
 msgid "pgp not found: "
 msgstr "Dosya sunucuda bulunamadı"
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr "Parola kontrolü başarısızlıkla sonuçlandı\n"
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr "Parola doğru.\n"
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr "--sign sadece paket olusturulurken kullanılabilir"
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 #, fuzzy
 msgid "exec failed\n"
 msgstr "%s: Erişilemedi\n"
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags için beklenmeyen argümanlar"
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr "imzası kontrol edilecek paketler belirtilmedi"
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr "imzalanacak paketler belirtilmedi"
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr "sistemden silinecek paketler belirtilmedi"
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr "yüklenecek paketler belirtilmedi"
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr "tüm paketlerin sorgulanması için fazladan argümanlar belirtildi"
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 #, fuzzy
 msgid "extra arguments given for verify of all packages"
 msgstr "tüm paketlerin sorgulanması için fazladan argümanlar belirtildi"
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr "doğrulama için hiç argüman belirtilmedi"
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, fuzzy, c-format
 msgid "cannot open package: %s\n"
 msgstr "hata: %s%s/packages.rpm açılamıyor\n"
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "%s paketi bulunamadı\n"
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "%s dosyası açılamıyor: "
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 #, fuzzy
 msgid "print macro expansion to stdout"
 msgstr "Kullanılan RPM sürümünü verir"
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, fuzzy, c-format
 msgid "Usage: %s {--help}\n"
 msgstr "Kullanım: rpm {--help}"
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, fuzzy, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr "       rpm {--initdb}   [--dbpath <dizin>]"
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, fuzzy, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr "       rpm {--rebuilddb} [--rcfile <dosya>] [--dbpath <dizin>]"
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, fuzzy, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 
-#: rpmqv.c:306
-#, fuzzy
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-"                        [--rcfile <dosya>] [--ignorearch] [--dbpath <dizin>]"
-
-#: rpmqv.c:315
-#, fuzzy
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-"                        [--excludedocs] [--includedocs] [--rcfile <dosya>]"
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, fuzzy, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--erase -e] [--root <dizin>] [--noscripts] [--rcfile <dosya>]"
 
-#: rpmqv.c:330
-#, fuzzy
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
-msgstr ""
-"                        [--scripts] [--root <dizin>] [--rcfile <dosya>]"
-
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, fuzzy, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 "       rpm {--verify -V -y} [-afpg] [--root <dizin>] [--rcfile <dosya>]"
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, fuzzy, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr "       rpm {--setperms} [-afpg] [target]"
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, fuzzy, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr "       rpm {--setugids} [-afpg] [target]"
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, fuzzy, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  "
 "<dosya>]"
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 #, fuzzy
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr "                        [targets]"
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 #, fuzzy
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 "                        [--buildarch <mimari>] [--rmsource] specdosyası"
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, fuzzy, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr "       rpm {--rmsource} [--rcfile <dosya>] [-v] specdosyası"
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, fuzzy, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--rebuild} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, fuzzy, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 "       rpm {--recompile} [--rcfile <dosya>] [-v] kaynak1.rpm ... kaynakN.rpm"
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, fuzzy, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr "                        [--badreloc] dosya1.rpm ... dosyaN.rpm"
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, fuzzy, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr "       rpm {--resign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, fuzzy, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr "       rpm {--addsign} [--rcfile <dosya>] paket1 paket2 ... paketN"
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, fuzzy, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr "       rpm {--checksig -K} [--nopgp] [--nomd5] [--rcfile <dosya>]"
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 #, fuzzy
 msgid "  All modes support the following options:"
 msgstr "   tüm kipler aşağıdaki argümanları kabul ederler:"
 
-#: rpmqv.c:404
+#: rpmqv.c:406
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:406
+#: rpmqv.c:408
 #, fuzzy
-msgid "   --eval '<expr>+'       "
+msgid "   --eval '<name>+'       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:407
-#, fuzzy
-msgid "print the expansion of macro <expr> to stdout"
-msgstr "Kullanılan RPM sürümünü verir"
-
-#: rpmqv.c:408
+#: rpmqv.c:410
 #, fuzzy
 msgid "   --pipe <cmd>           "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:410
+#: rpmqv.c:412
 #, fuzzy
-msgid "   --macros <file:...>    "
+msgid "   --rcfile <file>        "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
-msgstr ""
-
-#: rpmqv.c:415
+#: rpmqv.c:417
 #, fuzzy
 msgid "   --dbpath <dir>         "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 #, fuzzy
 msgid "   --root <dir>           "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 #, fuzzy
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 "   yükleme, güncelleme ve sorgulama (-p ile) işlemlerimde dosya isimleri "
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 #, fuzzy
 msgid "  of file names as well as the following options:"
 msgstr "   yerine FTP adreslerini aşağıdaki seçeneklerle kabul eder:\n"
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 #, fuzzy
 msgid "     --ftpproxy <host>    "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 #, fuzzy
 msgid "     --ftpport <port>     "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 #, fuzzy
 msgid "     --httpproxy <host>   "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 #, fuzzy
 msgid "     --httpport <port>    "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 #, fuzzy
 msgid "  Package specification options:"
 msgstr "      Paket seçim seçenekleri:"
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 #, fuzzy
 msgid "query/verify all packages"
 msgstr "Tüm paketleri sorgulama"
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 #, fuzzy
 msgid "     -f <file>+           "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 #, fuzzy
 msgid "query/verify package owning <file>"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 #, fuzzy
 msgid "     -p <packagefile>+    "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 #, fuzzy
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr "(henüz yüklenmemiş) <paket dosyası> paketi sorgulama"
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 #, fuzzy
 msgid "     --triggeredby <pkg>  "
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 #, fuzzy
 msgid "query/verify packages triggered by <pkg>"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 #, fuzzy
 msgid "     --whatprovides <cap> "
 msgstr "        --requires"
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 #, fuzzy
 msgid "query/verify packages which provide <cap> capability"
 msgstr "<i> yeteneği olan paketleri sorgulama"
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 #, fuzzy
 msgid "     --whatrequires <cap> "
 msgstr "        --requires"
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 #, fuzzy
 msgid "query/verify packages which require <cap> capability"
 msgstr "<i> yeteneğine ihtiyaç duyan paketleri sorgulama"
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 #, fuzzy
 msgid "    Information selection options:"
 msgstr "      Bilgilendirme seçenekleri:"
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 #, fuzzy
 msgid "list capabilities provided by package"
 msgstr "paketin sağladığı yetenekleri sıralar"
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 #, fuzzy
 msgid "list capabilities required by package"
 msgstr "paketin sağladığı yetenekleri sıralar"
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 #, fuzzy
 msgid "print the various [un]install scriptlets"
 msgstr "paketin çeşitli yükleme, silme betiklerini (scripts) gösterir"
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 #, fuzzy
 msgid "do not execute verify script (if any)"
 msgstr "adımların hiçbirini çalıştırmaz"
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 #, fuzzy
 msgid "   --install <packagefile>"
 msgstr "paket yüklemek"
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 #, fuzzy
 msgid "   -i <packagefile>       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 #, fuzzy
 msgid "     --excludepath <path> "
 msgstr "dosyaları <eskidizin> den <yenidizin> e relocate et"
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 #, fuzzy
 msgid "don't execute any installation scriptlets"
 msgstr "yükleme betiklerini (scripts) çalıştırmaz."
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 #, fuzzy
 msgid "don't execute any scriptlets triggered by this package"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 #, fuzzy
 msgid "     --prefix <dir>       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 #, fuzzy
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr "dosyaları <eskidizin> den <yenidizin> e relocate et"
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 #, fuzzy
 msgid "   --upgrade <packagefile>"
 msgstr "paket yüklemek"
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 #, fuzzy
 msgid "   -U <packagefile>       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 #, fuzzy
 msgid "   --erase <package>"
 msgstr "paket yüklemek"
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 #, fuzzy
 msgid "   -b<stage> <spec>       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 #, fuzzy
 msgid "   -t<stage> <tarball>    "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 #, fuzzy
 msgid "package src rpm only"
 msgstr "pakedin adı yok :-)"
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 #, fuzzy
 msgid "     --buildroot <dir>    "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 #, fuzzy
 msgid "     --target=<platform>+ "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 #, fuzzy
 msgid "   --rebuild <src_pkg>    "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 #, fuzzy
 msgid "   --recompile <src_pkg>  "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 #, fuzzy
 msgid "   --resign <pkg>+        "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 #, fuzzy
 msgid "   --addsign <pkg>+       "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 #, fuzzy
 msgid "   --checksig <pkg>+"
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 #, fuzzy
 msgid "   -K <pkg>+             "
 msgstr "    -b<adım> <spec>      "
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 #, fuzzy
 msgid "rebuild database indices from existing database headers"
 msgstr "mevcut veritabanını kullanılarak veritabınını yeniden oluşturur"
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 #, fuzzy
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr "Yerine  -e veya --erase komutunu kullanın\n"
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr "--dbpath veritabanı kullanılmayan bir işlemde belirtildi"
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 #, fuzzy
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr "--justdb sadece paket yükleme ve silmelerinde kullanılır"
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr "yeniden oluşturmak için paket dosyaları belirtilmedi"
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr "oluşturma için gerekli spec dosyası belirtilmedi"
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr "oluşturma için gereken tar dosyaları belirttilmedi"
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "%s okuma erişimi için açılamadı:%s."
 
-#: build/build.c:190
+#: build/build.c:192
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "%s alınıyor\n"
 
-#: build/build.c:196
+#: build/build.c:198
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr "%s 'ye erisimde belirtilen hata oluştu: %s\n"
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 #, fuzzy
 msgid "syntax error while parsing =="
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: build/expression.c:237
+#: build/expression.c:238
 #, fuzzy
 msgid "syntax error while parsing &&"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: build/expression.c:246
+#: build/expression.c:247
 #, fuzzy
 msgid "syntax error while parsing ||"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: build/expression.c:286
+#: build/expression.c:287
 #, fuzzy
 msgid "parse error in expression"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 #, fuzzy
 msgid "syntax error in expression"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, fuzzy, c-format
 msgid "Missing '(' in %s %s"
 msgstr "% den sonra eksik {"
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, fuzzy, c-format
 msgid "Missing ')' in %s(%s"
 msgstr "%s te eksik ':' :%d"
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, fuzzy, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr "%s okunamadı: %s"
 
-#: build/files.c:396
+#: build/files.c:397
 #, fuzzy, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr "%s okunamadı: %s"
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, fuzzy, c-format
 msgid "Two files on one line: %s"
 msgstr "%s açılamadı: %s"
 
-#: build/files.c:714
+#: build/files.c:715
 #, fuzzy, c-format
 msgid "File must begin with \"/\": %s"
 msgstr "relocate işlemi / ile başlamalı"
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, fuzzy, c-format
 msgid "File listed twice: %s"
 msgstr "%s okunamadı: %s"
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr "%s okunamadı: %s"
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, fuzzy, c-format
 msgid "File not found: %s"
 msgstr "Dosya sunucuda bulunamadı"
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, fuzzy, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr "%s açılamadı: %s"
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, fuzzy, c-format
 msgid "File not found by glob: %s"
 msgstr "Dosya sunucuda bulunamadı"
 
-#: build/files.c:1235
+#: build/files.c:1236
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "hata: %s dosyası okunamadı\n"
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1896,7 +1859,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1922,490 +1885,505 @@ msgstr "PGP hata verdi"
 msgid "failed to write all data to %s"
 msgstr "%s yaratılamıyor\n"
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s yaratılamıyor\n"
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "%s açılamadı: %s"
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s"
 msgstr "okuma hatası: %s (%d)"
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s"
 msgstr "hata: %s dosyası okunamadı\n"
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s"
 msgstr "hata: %s dosyası okunamadı\n"
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s"
 msgstr "hata: %s dosyası okunamadı\n"
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s"
 msgstr "hata: %s dosyası okunamadı\n"
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "%s açılamadı: %s"
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "%s okunamadı: %s"
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "hata: %s herhangi bir RPM pakedine ait görünmüyor\n"
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "%s kaydına %s dosyasında erişilemiyor:"
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
+#: build/pack.c:408
+#, fuzzy, c-format
+msgid "Generating signature: %d\n"
+msgstr "PGP-imzası yaratır"
+
 # , c-format
-#: build/pack.c:400
+#: build/pack.c:418
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s 'ye erişimde hata oluştu\n"
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "%s 'nin yazılması mümkün değil"
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, fuzzy, c-format
-msgid "Generating signature: %d\n"
-msgstr "PGP-imzası yaratır"
+msgid "Unable to open sigtarget %s: %s"
+msgstr "%s 'nin yazılması mümkün değil"
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, fuzzy, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr "%s 'nin yazılması mümkün değil"
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, fuzzy, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr "%s 'nin yazılması mümkün değil"
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, fuzzy, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr "%s 'nin yazılması mümkün değil"
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, fuzzy, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr "%s 'nin yazılması mümkün değil"
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyası açılamıyor: "
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "%s paketi %s altında gözükmüyor"
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, fuzzy, c-format
 msgid "Unable to open icon %s: %s"
 msgstr "%s 'nin yazılması mümkün değil"
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, fuzzy, c-format
 msgid "Unable to read icon %s: %s"
 msgstr "%s 'nin yazılması mümkün değil"
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, fuzzy, c-format
 msgid "Unknown icon type: %s"
 msgstr "(bilinmeyen tip)"
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, fuzzy, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, fuzzy, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr "relocate işlemi / ile başlamalı"
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, fuzzy, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr "geçersiz paket numarsı: %s\n"
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, fuzzy, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr "geçersiz paket numarsı: %s\n"
+
+#: build/parsePreamble.c:610
 #, fuzzy, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr "%s için %s te eksik mimari:%d"
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, fuzzy, c-format
 msgid "Bad package specification: %s"
 msgstr "      Paket seçim seçenekleri:"
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, fuzzy, c-format
 msgid "Bad source: %s: %s"
 msgstr "%s okunamadı: %s"
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, fuzzy, c-format
 msgid "No patch number %d"
 msgstr "(üye değil)"
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, fuzzy, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr "%s okunamadı: %s"
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, fuzzy, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr "relocate işlemi / ile başlamalı"
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, fuzzy, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr "%s paketi %s altında gözükmüyor"
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, fuzzy, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr "%s paketi %s altında gözükmüyor"
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, fuzzy, c-format
 msgid "line %d: Version required: %s"
 msgstr "%s açılamadı: %s"
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, fuzzy, c-format
 msgid "line %d: %s"
 msgstr "%s açılamadı: %s"
 
 # , c-format
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, fuzzy, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s 'ye erişimde hata oluştu\n"
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 #, fuzzy
 msgid "No buildable architectures"
 msgstr "paket mimarisini doğrulamaz"
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 #, fuzzy
 msgid "Package has no %%description: %s"
 msgstr "%s paketi %s altında gözükmüyor"
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, fuzzy, c-format
 msgid "line %d: Bad number: %s"
 msgstr "geçersiz paket numarsı: %s\n"
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, fuzzy, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr "geçersiz paket numarsı: %s\n"
@@ -2420,185 +2398,185 @@ msgstr "%s okunamadı: %s"
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, fuzzy, c-format
 msgid "(error 0x%x)"
 msgstr "hata: "
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 #, fuzzy
 msgid "Unknown file type"
 msgstr "(bilinmeyen tip)"
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 #, fuzzy
 msgid "Internal error"
 msgstr "ölümcül hata: "
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 #, fuzzy
 msgid " failed - "
 msgstr "PGP hata verdi"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s dosyası, hiç bir pakete ait değil\n"
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s dosyası, hiç bir pakete ait değil\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s paketi %s altında gözükmüyor"
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi %s altında gözükmüyor"
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "%s kaydının %s dosyasından silinmesinde hata"
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "%s açılamadı: %s"
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "mevcut veritabanını kullanılarak veritabınını yeniden oluşturur"
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "Veritabanı için %s kilit (lock) alınamadı"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr "özel"
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr "paylaşılan (shared)"
 
@@ -2627,57 +2605,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, fuzzy, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr "mevcut veritabanını kullanılarak veritabınını yeniden oluşturur"
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "Veritabanı için %s kilit (lock) alınamadı"
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2693,127 +2671,113 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr "(üye değil)"
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr "mntctl() çağrısı boyut bilgisi vermedi: %s"
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, fuzzy, c-format
 msgid "failed to stat %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr "% den sonra eksik {"
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr "%{ den sonra eksik }"
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr "boş tag tanımlaması"
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr "boş tag ismi"
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr "bilinmeyen tag"
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr "dizinin sonunda ] bekleniyordu"
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr "beklenmeyen ]"
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr "beklenmeyen }"
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "dizi içerisinde ? den sonra { bekleniyordu"
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr "dizi içerisinde } bekleniyordu"
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr "? altdizisinden sonra : bekleniyordu"
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "dizide : den sonra { bekleniyordu"
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr "dizinin sonunda | bekleniyordu"
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr "(bilinmeyen tip)"
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, fuzzy, c-format
 msgid "   file: %s action: %s\n"
 msgstr "%s açılamadı: %s"
@@ -2828,586 +2792,585 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 #, fuzzy
 msgid "installing a source package\n"
 msgstr "paket yüklemek"
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, fuzzy, c-format
 msgid "cannot create sourcedir %s"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, fuzzy, c-format
 msgid "cannot write to %s"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, fuzzy, c-format
 msgid "cannot create specdir %s"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, fuzzy, c-format
 msgid "spec file in: %s\n"
 msgstr "%s açılamadı: %s"
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 #, fuzzy
 msgid "source package contains no .spec file"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr "%s 'nin isminin  %s 'ye çevrilmesinde belirtilen hata oluştu: %s"
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, fuzzy, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/package.c:61
+#: lib/package.c:85
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "RPM'in bu sürümünde sadece major numarası <= 3 olan paketler destekleniyor"
 
-#: lib/package.c:119
+#: lib/package.c:142
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 "RPM'in bu sürümünde sadece major numarası <= 3 olan paketler destekleniyor"
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 #, fuzzy
 msgid "verify %%files section from spec file"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 #, fuzzy
 msgid "build source and binary package from spec file"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 #, fuzzy
 msgid "build binary package from spec file"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 #, fuzzy
 msgid "build source package from spec file"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 #, fuzzy
 msgid "build source and binary package from tar ball"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 #, fuzzy
 msgid "build source package from tar ball"
 msgstr "paketleri <os> işletim sistemi için oluşturur"
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 #, fuzzy
 msgid "build binary package from source package"
 msgstr ""
 "çalıştırılabilir paket yaratma (hazırlama, derleme, yükleme, paketleme)"
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 #, fuzzy
 msgid "build through %%install stage from source package"
 msgstr "paket yüklemek"
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 #, fuzzy
 msgid "override build root"
 msgstr "paket yaratılırken <dizin> başlangıç dizini olarak kullanılır"
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 #, fuzzy
 msgid "do not execute any stages of the build"
 msgstr "adımların hiçbirini çalıştırmaz"
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 #, fuzzy
 msgid "remove specfile when done"
 msgstr "işlem sonunda kaynakları ve spec dosyasını siler"
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 #, fuzzy
 msgid "query/verify package owning file"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 #, fuzzy
 msgid "query/verify packages in group"
 msgstr "pakedin adı yok :-)"
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 #, fuzzy
 msgid "query/verify a package file"
 msgstr "Tüm paketleri sorgulama"
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 #, fuzzy
 msgid "rpm query mode"
 msgstr "Sorgulama kipi"
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 #, fuzzy
 msgid "query a spec file"
 msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n"
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 #, fuzzy
 msgid "query the pacakges triggered by the package"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 #, fuzzy
 msgid "rpm verify mode"
 msgstr "Sorgulama kipi"
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 #, fuzzy
 msgid "rpm verify mode (legacy)"
 msgstr "Sorgulama kipi"
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 #, fuzzy
 msgid "query the packages which require a capability"
 msgstr "<i> yeteneğine ihtiyaç duyan paketleri sorgulama"
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 #, fuzzy
 msgid "query the packages which provide a capability"
 msgstr "<i> yeteneği olan paketleri sorgulama"
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 #, fuzzy
 msgid "list all configuration files"
 msgstr ""
 "sadece yapılandırma (configuration) dosyalarını gösterir (impliziert -l)"
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 #, fuzzy
 msgid "list all documentation files"
 msgstr "paket ile gelen belgeleri de yükler"
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 #, fuzzy
 msgid "dump basic file information"
 msgstr "Paket bilgisini gösterme"
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 #, fuzzy
 msgid "list files in package"
 msgstr "paket yüklemek"
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 #, fuzzy
 msgid "use the following query format"
 msgstr "beklenmeyen sorgulama kaynağı girildi"
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 #, fuzzy
 msgid "substitute i18n sections into spec file"
 msgstr "<dosya> isimli dosyayı içeren paketi sorgulamak"
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 #, fuzzy
 msgid "display a verbose file listing"
 msgstr "Paketin içerdiği dosyaları gösterme"
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ", %s-%s-%s tarafından kullanılıyor\n"
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ", %s-%s-%s ile çelişiyor\n"
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, fuzzy, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, fuzzy, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr "%s pakedi yüklenmemiş\n"
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, fuzzy, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr "%s pakedi yüklenmemiş\n"
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, fuzzy, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ", %s-%s-%s ile çelişiyor\n"
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, fuzzy, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, fuzzy, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "Paket %s-%s-%s ortak (shared) dosyalar içeriyor\n"
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr "format hatası: %s\n"
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr "(hiç dosya içermiyor)"
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 #, fuzzy
 msgid "not installed "
 msgstr "%s pakedi yüklenmemiş\n"
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(bilinmeyen tip)"
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "hata: %s erişilemiyor\n"
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s 'ye erisimde belirtilen hata oluştu: %s\n"
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr "eski tip kaynak paketleri sorgulanamıyor\n"
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s bir RPM paketi değil (gibi)\n"
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n"
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n"
 
-#: lib/query.c:590
+#: lib/query.c:591
 #, fuzzy
 msgid "no packages\n"
 msgstr "Tüm paketleri sorgulama"
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "hiç bir paket %s tetiklemiyor\n"
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr "hiç bir paket %s gerektirmiyor\n"
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr "hiç bir paket  %s sağlamıyor\n"
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "%s açılamadı: %s"
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s dosyası, hiç bir pakete ait değil\n"
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "geçersiz paket numarsı: %s\n"
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "geçersiz paket numarsı: %s\n"
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr "%d numaralı kayıt okunamadı\n"
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s pakedi yüklenmemiş\n"
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Erişilemedi\n"
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Erişilemedi\n"
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: 'readLead' hata verdi\n"
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: 'readLead' hata verdi\n"
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: 'readLead' hata verdi\n"
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: v1.0-RPM (eski sürüm) imzalanamıyor\n"
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: v2.0-RPM (eski sürüm) yeniden imzalanamıyor\n"
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: 'rpmReadSignature' hata verdi\n"
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: İmza bulunmuyor\n"
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: 'readLead' hata verdi\n"
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: 'rpmReadSignature' hata verdi\n"
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: İmza bulundurmuyor (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (EKSİK ANAHTARLAR)"
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3481,7 +3444,7 @@ msgstr "%s kaydı %s dosyasına yazılamıyor"
 msgid "error(%d) removing record %s from %s"
 msgstr "%s kaydının %s dosyasından silinmesinde hata"
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr "dbpath değeri girilmemiş"
 
@@ -3492,527 +3455,521 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, fuzzy, c-format
 msgid "error(%d) counting packages"
 msgstr "%s pakedi aranırken hata oluştu\n"
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%d kaydından başlık bilgisi okunamadı"
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydının %s dosyasından silinmesinde hata"
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%s kaydının %s dosyasından silinmesinde hata"
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance"
 msgstr "%s pakedi aranırken hata oluştu\n"
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s kaydının %s dosyasından silinmesinde hata"
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "mevcut veritabanını kullanılarak veritabınını yeniden oluşturur"
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "geçici veritabanı %s mevcut"
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "mevcut veritabanını kullanılarak veritabınını yeniden oluşturur"
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "mevcut veritabanını kullanılarak veritabınını yeniden oluşturur"
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "veritabanındaki %d numaralı kayıt hatalı -- atlanıyor"
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d de yer alan kayıt saklayamıyor"
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açılamadı: %s"
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 #, fuzzy
 msgid "Preparing packages for installation..."
 msgstr "yüklenecek paketler belirtilmedi"
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "yüklenecek paketler belirtilmedi"
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "Tüm paketleri sorgulama"
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "%s pakedi aranırken hata oluştu\n"
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "hata: %s atlanıyor - aktarım başarısız - %s\n"
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s alınıyor\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hata: %s atlanıyor - aktarım başarısız - %s\n"
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "hata: %s yüklenemedi\n"
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "hata: %s%s/packages.rpm açılamıyor\n"
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s pakedi yüklenmemiş\n"
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr "bağımlılık hatası, aşağıdaki paketlere ihtiyacınız var:\n"
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "paket yüklemek"
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, fuzzy, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr "hata: %s%s/packages.rpm açılamıyor\n"
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" birden fazla paketi tanımlıyor\n"
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr "bu paketin silinmesi aşağıdaki bağımlılıkları etkileyecektir:\n"
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "hata: %s erişilemiyor\n"
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s yükleniyor\n"
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr "okuma hatası: %s (%d)"
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr "%s te ikinci ':' eksik:%d"
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr "%s te eksik mimari tanımlaması:%d"
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr "%s te eksik data satırı:%d"
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr "%s te data satırında çok fazla argüman:%d"
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr "Kötü arch/os numarası %s: (%s:%d)"
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr "%s te eksik default satırı:%d"
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr "%s te default satırında çok fazla argüman:%d"
 
-#: lib/rpmrc.c:551
-#, fuzzy, c-format
+#: lib/rpmrc.c:554
+#, c-format
 msgid "Cannot expand %s"
-msgstr "%s dosyası açılamıyor: "
+msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr "%s okuma erişimi için açılamadı:%s."
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr "%s okunamadı: %s"
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, fuzzy, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr "%s te eksik ':' :%d"
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr "%s için %s te eksik argüman :%d"
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, fuzzy, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr "%s açılamadı: %s"
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, fuzzy, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr "%s dosyası açılamıyor: "
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr "%s için %s te eksik mimari:%d"
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr "%s geçersiz seçenek %s:%d"
 
-#: lib/rpmrc.c:1202
-#, fuzzy, c-format
+#: lib/rpmrc.c:1205
+#, c-format
 msgid "Unknown system: %s\n"
-msgstr "(bilinmeyen tip)"
-
-#: lib/rpmrc.c:1203
-msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
+#: lib/rpmrc.c:1206
+msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: İmza bulunmuyor\n"
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "PGP-imzası yaratır"
 
-#: lib/signature.c:154
+#: lib/signature.c:157
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr "Eski imza !!! Eee bunu nasıl başardın bakiiim ?"
 
-#: lib/signature.c:157
-#, fuzzy
-msgid "New Header signature\n"
-msgstr "imzayı okumak mümkün olmadı"
-
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr "PGP çalıştırılamadı"
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr "PGP hata verdi"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr "PGP imzasının yazılması sırasında hata oluştu"
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr "imzayı okumak mümkün olmadı"
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 #, fuzzy
 msgid "Couldn't exec gpg"
 msgstr "PGP çalıştırılamadı"
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 #, fuzzy
 msgid "gpg failed"
 msgstr "PGP hata verdi"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 #, fuzzy
 msgid "gpg failed to write signature"
 msgstr "PGP imzasının yazılması sırasında hata oluştu"
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP-imzası yaratır"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "PGP-imzası yaratır"
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr "PGP çalıştırılamadı. PGP kontrollerini atlamak için --nopgp kullanın."
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 #, fuzzy
 msgid "exec failed!\n"
 msgstr "%s: Erişilemedi\n"
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr "PGP çalıştırılamadı. PGP kontrollerini atlamak için --nopgp kullanın."
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr "PGP çalıştırılamadı"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 #, fuzzy
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr "rpmrc dosyanızda \"pgp_name:\" tanımlanmış olmalı"
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 #, fuzzy
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "rpmrc dosyanızda \"pgp_name:\" tanımlanmış olmalı"
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, fuzzy, c-format
 msgid "excluding file %s%s\n"
 msgstr "%s alınıyor\n"
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizinin oluşturulmasında hata: %s"
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr "%s silinemedi - belirtilen dizin boş değil"
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr "%s dizinin silinmesinde belirtilen hata oluştu: %s"
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr "%s 'in silinmesinde belirtilen hata oluştu: %s"
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, fuzzy, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr "betik (script) çalıştırılamadı "
@@ -4040,226 +3997,234 @@ msgstr "% den sonra eksik {"
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s 'nin bağımlılık sorunları: "
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 #, fuzzy
 msgid "Bad server response"
 msgstr "FTP sunucusundan kötü yanıt"
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP I/O hatası"
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP sunucusu zaman aşımı"
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP sunucusunun isim adres dönüşümü yapılamadı"
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP sunucusunun adres isim dönüşümü yapılamadı"
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "FTP sunucusuna bağlanılamadı"
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "FTP sunucusu ile veri alışverişi yapılamadı"
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr "Yerel dosyaya erişim sırasında I/O hatası"
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr "Karşı sunucuyu pasif kipe sokam hatası"
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr "Dosya sunucuda bulunamadı"
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP bilinmeyen ya da beklenmeyen hata"
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 #, fuzzy
 msgid "Macro %%%.*s not found, skipping"
 msgstr "%s pakedi %s içerisinde bulunamadı"
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, fuzzy, c-format
 msgid "File %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 #, fuzzy
 msgid "(no error)"
 msgstr "hata: "
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr "ölümcül hata: "
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr "hata: "
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr "uyarı: "
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s'%s için parola"
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, fuzzy, c-format
 msgid "error: %sport must be a number\n"
 msgstr "hata: ftpport bir sayı olmalı\n"
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 #, fuzzy
 msgid "url port must be a number\n"
 msgstr "hata: ftpport bir sayı olmalı\n"
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s açılamadı: %s"
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, fuzzy, c-format
 msgid "failed to create %s: %s\n"
 msgstr "%s yaratılamıyor\n"
 
-#~ msgid "loop in prerequisite chain: %s"
-#~ msgstr "gerekenler zincirinde döngü: %s"
+#, fuzzy
+#~ msgid "New Header signature\n"
+#~ msgstr "imzayı okumak mümkün olmadı"
 
 #, fuzzy
-#~ msgid "   --rcfile <file>        "
-#~ msgstr "    -b<adım> <spec>      "
+#~ msgid "path %s is not relocateable for package %s-%s-%s"
+#~ msgstr "%s pakedi yüklenmemiş\n"
+
+#, fuzzy
+#~ msgid "Unable to read sigtarget %s: %s"
+#~ msgstr "%s 'nin yazılması mümkün değil"
+
+#~ msgid "loop in prerequisite chain: %s"
+#~ msgstr "gerekenler zincirinde döngü: %s"
 
 #~ msgid ""
 #~ "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
@@ -4494,6 +4459,10 @@ msgstr "%s yaratılamıyor\n"
 #~ msgstr "pakedin adı yok :-)"
 
 #, fuzzy
+#~ msgid "cannot create %s"
+#~ msgstr "%s dosyası açılamıyor: "
+
+#, fuzzy
 #~ msgid "Unable to stat icon: %s"
 #~ msgstr "%s 'nin yazılması mümkün değil"
 
diff --git a/po/uk.po b/po/uk.po
index 268c54c31..b6b43ac46 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 268c54c31..b6b43ac46 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 268c54c31..b6b43ac46 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 268c54c31..b6b43ac46 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-11-07 07:55-0500\n"
+"Project-Id-Version: rpm 4.0.1\n"
+"POT-Creation-Date: 2000-12-12 13:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,1678 +14,1648 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:532
+#: build.c:26
 #, c-format
-msgid "cannot open %s/packages.rpm\n"
+msgid "cannot open rpm database in %s\n"
 msgstr ""
 
-#: build.c:35
+#: build.c:36
 msgid "failed build dependencies:\n"
 msgstr ""
 
-#: build.c:64
+#: build.c:65
 #, c-format
 msgid "Unable to open spec file %s: %s\n"
 msgstr ""
 
-#: build.c:126 build.c:138
+#: build.c:131 build.c:143
 #, c-format
 msgid "Failed to open tar pipe: %m"
 msgstr ""
 
 #. Give up
-#: build.c:145
+#: build.c:150
 #, c-format
 msgid "Failed to read spec file from %s"
 msgstr ""
 
-#: build.c:172
+#: build.c:177
 #, c-format
 msgid "Failed to rename %s to %s: %m"
 msgstr ""
 
-#: build.c:211
+#: build.c:216
 #, c-format
 msgid "failed to stat %s: %m"
 msgstr ""
 
-#: build.c:216
+#: build.c:221
 #, c-format
 msgid "File %s is not a regular file."
 msgstr ""
 
-#: build.c:224
+#: build.c:229
 #, c-format
 msgid "File %s does not appear to be a specfile."
 msgstr ""
 
 #. parse up the build operators
-#: build.c:285
+#: build.c:289
 #, c-format
 msgid "Building target platforms: %s\n"
 msgstr ""
 
-#: build.c:300
+#: build.c:304
 #, c-format
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:184 rpmqv.c:267
+#: rpm.c:185 rpmqv.c:269
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:195 rpmqv.c:278
+#: rpm.c:196 rpmqv.c:280
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:199 rpmqv.c:282
+#: rpm.c:200 rpmqv.c:284
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:283
+#: rpm.c:201 rpmqv.c:285
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:208
+#: rpm.c:209
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:209
+#: rpm.c:210
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:210
+#: rpm.c:211
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:212
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:212 rpmqv.c:304
+#: rpm.c:213 rpmqv.c:306
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:305
+#: rpm.c:214 rpmqv.c:307
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:214
+#: rpm.c:215 rpmqv.c:308
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:307
+#: rpm.c:216 rpmqv.c:309
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:216 rpm.c:225 rpm.c:235 rpmqv.c:308 rpmqv.c:317 rpmqv.c:333
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:310 rpmqv.c:319 rpmqv.c:335
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:236 rpmqv.c:309 rpmqv.c:318 rpmqv.c:334
+#: rpm.c:218 rpm.c:237 rpmqv.c:311 rpmqv.c:320 rpmqv.c:336
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpmqv.c:310
+#: rpm.c:219 rpmqv.c:312
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:311
+#: rpm.c:220 rpmqv.c:313
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:312
+#: rpm.c:221 rpmqv.c:314
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:221
+#: rpm.c:222
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:222 rpmqv.c:314
+#: rpm.c:223 rpmqv.c:316
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:223
+#: rpm.c:224 rpmqv.c:317
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:316
+#: rpm.c:225 rpmqv.c:318
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:227
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:227 rpmqv.c:319
+#: rpm.c:228 rpmqv.c:321
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:320
+#: rpm.c:229 rpmqv.c:322
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:321
+#: rpm.c:230 rpmqv.c:323
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:322
+#: rpm.c:231 rpmqv.c:324
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:231
+#: rpm.c:232
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:232
+#: rpm.c:233 rpmqv.c:332
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:331
+#: rpm.c:234 rpmqv.c:333
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:332
+#: rpm.c:235 rpmqv.c:334
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:237 rpmqv.c:335
+#: rpm.c:238 rpmqv.c:337
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:336
+#: rpm.c:239 rpmqv.c:338
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:240
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:240 rpmqv.c:338
+#: rpm.c:241 rpmqv.c:340
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:339
+#: rpm.c:242 rpmqv.c:341
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:243
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:244
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:244
+#: rpm.c:245
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:245
+#: rpm.c:246
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:246 rpmqv.c:324
+#: rpm.c:247 rpmqv.c:326
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:325
+#: rpm.c:248 rpmqv.c:327
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:249
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:250
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:251
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251 rpmqv.c:360
+#: rpm.c:252 rpmqv.c:362
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:253
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:253
+#: rpm.c:254
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:287 rpmqv.c:396
+#: rpm.c:288 rpmqv.c:398
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:289 rpmqv.c:398
+#: rpm.c:290 rpmqv.c:400
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:291 rpmqv.c:400
+#: rpm.c:292 rpmqv.c:402
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:294
+#: rpm.c:295
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:295
+#: rpm.c:296
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:296 rpmqv.c:152 rpmqv.c:405
+#: rpm.c:297 rpmqv.c:154 rpmqv.c:407
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:297
+#: rpm.c:298
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:298
+#: rpm.c:299 rpmqv.c:409
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:299
+#: rpm.c:300
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:300 rpmqv.c:409
+#: rpm.c:301 rpmqv.c:411
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:301
+#: rpm.c:302
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:302
+#: rpm.c:303 rpmqv.c:413
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:304 rpmqv.c:413
+#: rpm.c:305 rpmqv.c:415
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:306 rpmqv.c:421
+#: rpm.c:307 rpmqv.c:423
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:308 rpmqv.c:423
+#: rpm.c:309 rpmqv.c:425
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:311
+#: rpm.c:312
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:312
+#: rpm.c:313
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:313
+#: rpm.c:314
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:314 rpmqv.c:430
+#: rpm.c:315 rpmqv.c:432
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:315
+#: rpm.c:316
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:316 rpmqv.c:432
+#: rpm.c:317 rpmqv.c:434
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:317
+#: rpm.c:318
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:318 rpmqv.c:434
+#: rpm.c:319 rpmqv.c:436
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:319
+#: rpm.c:320
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:320 rpmqv.c:436
+#: rpm.c:321 rpmqv.c:438
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:324 rpmqv.c:456
+#: rpm.c:325 rpmqv.c:458
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:325 rpm.c:371 rpm.c:396 rpm.c:448 rpm.c:522
+#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:326 rpm.c:372 rpm.c:397 rpm.c:449 rpm.c:523 rpmqv.c:416
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:418
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:328
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:328 rpmqv.c:458
+#: rpm.c:329 rpmqv.c:460
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:329 rpm.c:373 rpm.c:431 rpm.c:460
+#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:330 rpm.c:374 rpm.c:432 rpm.c:461 rpm.c:525 rpmqv.c:418
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:420
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:332
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:334
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:335
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:336
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:336
+#: rpm.c:337
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:338
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:338
+#: rpm.c:339
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:340
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:340
+#: rpm.c:341
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:342
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:342
+#: rpm.c:343
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:343
+#: rpm.c:344
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:345
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:346 rpmqv.c:462
+#: rpm.c:347 rpmqv.c:464
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:348 rpmqv.c:464
+#: rpm.c:349 rpmqv.c:466
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:350 rpmqv.c:466
+#: rpm.c:351 rpmqv.c:468
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:352 rpmqv.c:468
+#: rpm.c:353 rpmqv.c:470
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:354 rpmqv.c:470
+#: rpm.c:355 rpmqv.c:472
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:356 rpmqv.c:472
+#: rpm.c:357 rpmqv.c:474
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:358 rpmqv.c:474
+#: rpm.c:359 rpmqv.c:476
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:361
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:362
+#: rpm.c:363
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:365
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:367
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:370 rpmqv.c:485
+#: rpm.c:371 rpmqv.c:487
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:376 rpm.c:418 rpm.c:453 rpmqv.c:487 rpmqv.c:535 rpmqv.c:569
+#: rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:489 rpmqv.c:537 rpmqv.c:571
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:378 rpmqv.c:491
+#: rpm.c:379 rpmqv.c:493
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:380 rpmqv.c:489
+#: rpm.c:381 rpmqv.c:491
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:382 rpmqv.c:496
+#: rpm.c:383 rpmqv.c:498
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:386
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:386
+#: rpm.c:387
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:387 rpmqv.c:510
+#: rpm.c:388 rpmqv.c:512
 msgid "install package"
 msgstr ""
 
-#: rpm.c:388
+#: rpm.c:389
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:390
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:390
+#: rpm.c:391
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:391 rpmqv.c:547
+#: rpm.c:392 rpmqv.c:549
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:393 rpmqv.c:515
+#: rpm.c:394 rpmqv.c:517
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:394
+#: rpm.c:395
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:395 rpmqv.c:545
+#: rpm.c:396 rpmqv.c:547
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:399 rpmqv.c:517
+#: rpm.c:400 rpmqv.c:519
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:401 rpmqv.c:521
+#: rpm.c:402 rpmqv.c:523
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:403 rpmqv.c:523
+#: rpm.c:404 rpmqv.c:525
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:405 rpmqv.c:512
+#: rpm.c:406 rpmqv.c:514
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:408 rpmqv.c:525
+#: rpm.c:409 rpmqv.c:527
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:410 rpmqv.c:527
+#: rpm.c:411 rpmqv.c:529
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:412 rpmqv.c:529
+#: rpm.c:413 rpmqv.c:531
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:414 rpmqv.c:531
+#: rpm.c:415 rpmqv.c:533
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:416 rpm.c:451 rpmqv.c:533 rpmqv.c:567
+#: rpm.c:417 rpm.c:452 rpmqv.c:535 rpmqv.c:569
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:420 rpm.c:455 rpmqv.c:537 rpmqv.c:571
+#: rpm.c:421 rpm.c:456 rpmqv.c:539 rpmqv.c:573
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:423
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:424 rpm.c:459 rpmqv.c:575
+#: rpm.c:425 rpm.c:460 rpmqv.c:577
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:426 rpmqv.c:543
+#: rpm.c:427 rpmqv.c:545
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:428 rpmqv.c:549
+#: rpm.c:429 rpmqv.c:551
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:430 rpmqv.c:551
+#: rpm.c:431 rpmqv.c:553
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:434 rpmqv.c:553
+#: rpm.c:435 rpmqv.c:555
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:437
+#: rpm.c:438
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:439
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:439 rpmqv.c:557
+#: rpm.c:440 rpmqv.c:559
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:441 rpmqv.c:559
+#: rpm.c:442 rpmqv.c:561
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:444
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:445 rpmqv.c:563
+#: rpm.c:446 rpmqv.c:565
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:447 rpmqv.c:565
+#: rpm.c:448 rpmqv.c:567
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:457 rpmqv.c:573
+#: rpm.c:458 rpmqv.c:575
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:464
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:464
+#: rpm.c:465
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:465 rpmqv.c:582
+#: rpm.c:466 rpmqv.c:584
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:467 rpmqv.c:584
+#: rpm.c:468 rpmqv.c:586
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:469 rpmqv.c:586
+#: rpm.c:470 rpmqv.c:588
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:471 rpmqv.c:588
+#: rpm.c:472 rpmqv.c:590
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:473 rpmqv.c:590
+#: rpm.c:474 rpmqv.c:592
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:475 rpmqv.c:592
+#: rpm.c:476 rpmqv.c:594
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:477 rpmqv.c:594
+#: rpm.c:478 rpmqv.c:596
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: lib/poptBT.c:156 rpm.c:479 rpmqv.c:598
+#: lib/poptBT.c:157 rpm.c:480 rpmqv.c:600
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: lib/poptBT.c:146 rpm.c:481 rpmqv.c:600
+#: lib/poptBT.c:147 rpm.c:482 rpmqv.c:602
 msgid "remove build tree when done"
 msgstr ""
 
-#: lib/poptBT.c:152 rpm.c:483 rpmqv.c:602
+#: lib/poptBT.c:153 rpm.c:484 rpmqv.c:604
 msgid "remove sources when done"
 msgstr ""
 
-#: rpm.c:485 rpmqv.c:604
+#: rpm.c:486 rpmqv.c:606
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:487 rpmqv.c:606
+#: rpm.c:488 rpmqv.c:608
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:488
+#: rpm.c:489
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:489 rpmqv.c:608
+#: rpm.c:490 rpmqv.c:610
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:491
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:491 rpmqv.c:610
+#: rpm.c:492 rpmqv.c:612
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:493 rpmqv.c:612
+#: rpm.c:494 rpmqv.c:614
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:494
+#: rpm.c:495
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:495
+#: rpm.c:496
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:498
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:498 rpmqv.c:615
+#: rpm.c:499 rpmqv.c:617
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:499
+#: rpm.c:500
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:500 rpmqv.c:617
+#: rpm.c:501 rpmqv.c:619
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:503
+#: rpm.c:504
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:504 rpmqv.c:623
+#: rpm.c:505 rpmqv.c:625
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:505
+#: rpm.c:506
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:506 rpmqv.c:625
+#: rpm.c:507 rpmqv.c:627
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:507
+#: rpm.c:508
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:509
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:509 rpmqv.c:629
+#: rpm.c:510 rpmqv.c:631
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:511 rpmqv.c:631
+#: rpm.c:512 rpmqv.c:633
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:513 rpmqv.c:633
+#: rpm.c:514 rpmqv.c:635
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:515 rpmqv.c:635
+#: rpm.c:516 rpmqv.c:637
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:519
+#: rpm.c:520
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:522
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:529 rpmqv.c:498
+#: rpm.c:530 rpmqv.c:500
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:532 rpmqv.c:501
+#: rpm.c:533 rpmqv.c:503
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:670 rpm.c:676 rpm.c:685 rpm.c:707 rpm.c:713 rpm.c:720 rpm.c:728
-#: rpm.c:736 rpm.c:757 rpm.c:820 rpmqv.c:823 rpmqv.c:832 rpmqv.c:838
-#: rpmqv.c:844 rpmqv.c:851 rpmqv.c:886 rpmqv.c:894 rpmqv.c:900 rpmqv.c:908
-#: rpmqv.c:976
+#: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:825 rpmqv.c:834 rpmqv.c:840
+#: rpmqv.c:846 rpmqv.c:853 rpmqv.c:888 rpmqv.c:896 rpmqv.c:902 rpmqv.c:910
+#: rpmqv.c:978
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:678 rpmqv.c:825
+#: rpm.c:679 rpmqv.c:827
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:680 rpmqv.c:827
+#: rpm.c:681 rpmqv.c:829
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:763 rpmqv.c:870
+#: rpm.c:764 rpmqv.c:872
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:765 rpmqv.c:872
+#: rpm.c:766 rpmqv.c:874
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:768 rpmqv.c:875
+#: rpm.c:769 rpmqv.c:877
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:777 rpmqv.c:859
+#: rpm.c:778 rpmqv.c:861
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:786 rpmqv.c:929
+#: rpm.c:787 rpmqv.c:931
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpm.c:787
+#: rpm.c:788
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:792 rpmqv.c:935
+#: rpm.c:793 rpmqv.c:937
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:827 rpmqv.c:991
+#: rpm.c:828 rpmqv.c:993
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:832 rpmqv.c:995
+#: rpm.c:833 rpmqv.c:997
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:835 rpmqv.c:998
+#: rpm.c:836 rpmqv.c:1000
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:838 rpmqv.c:1001
+#: rpm.c:839 rpmqv.c:1003
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:841 rpmqv.c:1021
+#: rpm.c:842 rpmqv.c:1023
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:844 rpmqv.c:1026
+#: rpm.c:845 rpmqv.c:1028
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:847 rpmqv.c:1029
+#: rpm.c:848 rpmqv.c:1031
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:850 rpmqv.c:1032
+#: rpm.c:851 rpmqv.c:1034
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:853 rpmqv.c:1035
+#: rpm.c:854 rpmqv.c:1037
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:856 rpmqv.c:1038
+#: rpm.c:857 rpmqv.c:1040
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:859 rpmqv.c:1041
+#: rpm.c:860 rpmqv.c:1043
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:863 rpmqv.c:1045
+#: rpm.c:864 rpmqv.c:1047
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:867 rpmqv.c:1049
+#: rpm.c:868 rpmqv.c:1051
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:871 rpmqv.c:1053
+#: rpm.c:872 rpmqv.c:1055
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:875 rpmqv.c:1057
+#: rpm.c:876 rpmqv.c:1059
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:879 rpmqv.c:1061
+#: rpm.c:880 rpmqv.c:1063
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:883 rpmqv.c:1065
+#: rpm.c:884 rpmqv.c:1067
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:887 rpmqv.c:1069
+#: rpm.c:888 rpmqv.c:1071
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:891 rpmqv.c:1073
+#: rpm.c:892 rpmqv.c:1075
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:895 rpmqv.c:1077
+#: rpm.c:896 rpmqv.c:1079
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:899 rpmqv.c:1081
+#: rpm.c:900 rpmqv.c:1083
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:903 rpmqv.c:1085
+#: rpm.c:904 rpmqv.c:1087
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:907 rpmqv.c:1089
+#: rpm.c:908 rpmqv.c:1091
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:912 rpmqv.c:1096
+#: rpm.c:913 rpmqv.c:1098
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:916
+#: rpm.c:917
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:920 rpmqv.c:1108
+#: rpm.c:921 rpmqv.c:1110
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:925 rpmqv.c:1113
+#: rpm.c:926 rpmqv.c:1115
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:929 rpmqv.c:1118
+#: rpm.c:930 rpmqv.c:1120
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:941 rpmqv.c:1130
+#: rpm.c:942 rpmqv.c:1132
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:947 rpmqv.c:1137
+#: rpm.c:948 rpmqv.c:1139
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:950 rpmqv.c:1142
+#: rpm.c:951 rpmqv.c:1144
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:953 rpmqv.c:1145
+#: rpm.c:954 rpmqv.c:1147
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:956 rpmqv.c:1150
+#: rpm.c:957 rpmqv.c:1152
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:967 rpmqv.c:1163
+#: rpm.c:968 rpmqv.c:1165
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:972 rpmqv.c:1168
+#: rpm.c:973 rpmqv.c:1170
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:987 rpmqv.c:1184
+#: rpm.c:988 rpmqv.c:1186
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:991 rpmqv.c:1188
+#: rpm.c:992 rpmqv.c:1190
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:993 rpmqv.c:1190
+#: rpm.c:994 rpmqv.c:1192
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:996 rpmqv.c:1193
+#: rpm.c:997 rpmqv.c:1195
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1001 rpmqv.c:1198
+#: rpm.c:1002 rpmqv.c:1200
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1007 rpmqv.c:1204
+#: rpm.c:1008 rpmqv.c:1206
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1022 rpmqv.c:1220
+#: rpm.c:1023 rpmqv.c:1222
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1041 rpmqv.c:1489
+#: rpm.c:1042 rpmqv.c:1491
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1052 rpmqv.c:1511
+#: rpm.c:1053 rpmqv.c:1513
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1063 rpmqv.c:1522
+#: rpm.c:1064 rpmqv.c:1524
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1079 rpmqv.c:1361
+#: rpm.c:1080 rpmqv.c:1363
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1130 rpmqv.c:1412
+#: rpm.c:1131 rpmqv.c:1414
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1153 rpmqv.c:1452
+#: rpm.c:1154 rpmqv.c:1454
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1158 rpmqv.c:1457
+#: rpm.c:1159 rpmqv.c:1459
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1175 rpmqv.c:1477
+#: rpm.c:1176 rpmqv.c:1479
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1179 rpmqv.c:1481
+#: rpm.c:1180 rpmqv.c:1483
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpm2cpio.c:23
+#: rpm2cpio.c:24
 #, c-format
 msgid "cannot open package: %s\n"
 msgstr ""
 
-#: rpm2cpio.c:33
+#: rpm2cpio.c:34
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:37
+#: rpm2cpio.c:38
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:59
+#: rpm2cpio.c:60
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
 
-#: rpmqv.c:152
+#: rpmqv.c:154
 msgid "'<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "print macro expansion to stdout"
 msgstr ""
 
-#: rpmqv.c:154
+#: rpmqv.c:156
 msgid "<expr>+"
 msgstr ""
 
-#: rpmqv.c:179
+#: rpmqv.c:181
 msgid "read <file:...> instead of default macro file(s)"
 msgstr ""
 
-#: rpmqv.c:180
+#: rpmqv.c:182
 msgid "<file:...>"
 msgstr ""
 
-#: rpmqv.c:294
+#: rpmqv.c:296
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:298
+#: rpmqv.c:300
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:299
+#: rpmqv.c:301
 #, c-format
-msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:303
+#: rpmqv.c:305
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:306
-msgid ""
-"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
-msgstr ""
-
-#: rpmqv.c:315
-msgid ""
-"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
-msgstr ""
-
-#: rpmqv.c:323
+#: rpmqv.c:325
 #, c-format
-msgid ""
-"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
-msgstr ""
-
-#: rpmqv.c:330
-msgid ""
-"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:337
+#: rpmqv.c:339
 #, c-format
-msgid ""
-"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
+msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:341
+#: rpmqv.c:343
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:342
+#: rpmqv.c:344
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:346
+#: rpmqv.c:348
 #, c-format
 msgid ""
-"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--macros "
-"<file:...>]\n"
+"       %s {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]\n"
 msgstr ""
 
-#: rpmqv.c:348
+#: rpmqv.c:350
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpmqv.c:349
+#: rpmqv.c:351
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpmqv.c:350
+#: rpmqv.c:352
 #, c-format
-msgid "       %s {--rmsource} [--macros <file:...>] [-v] specfile\n"
+msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
 msgstr ""
 
-#: rpmqv.c:351
+#: rpmqv.c:353
 #, c-format
 msgid ""
-"       %s {--rebuild} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:352
+#: rpmqv.c:354
 #, c-format
 msgid ""
-"       %s {--recompile} [--macros <file:...>] [-v] source1.rpm ... "
-"sourceN.rpm\n"
+"       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:353
+#: rpmqv.c:355
 #, c-format
 msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
 msgstr ""
 
-#: rpmqv.c:357
+#: rpmqv.c:359
 #, c-format
-msgid ""
-"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
+msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:358
+#: rpmqv.c:360
 #, c-format
-msgid ""
-"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
+msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:359
+#: rpmqv.c:361
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
-"<file:...>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
 msgstr ""
 
-#: rpmqv.c:403
+#: rpmqv.c:405
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:404
-msgid "   --define '<name> <body>'"
-msgstr ""
-
 #: rpmqv.c:406
-msgid "   --eval '<expr>+'       "
-msgstr ""
-
-#: rpmqv.c:407
-msgid "print the expansion of macro <expr> to stdout"
+msgid "   --define '<name> <body>'"
 msgstr ""
 
 #: rpmqv.c:408
-msgid "   --pipe <cmd>           "
+msgid "   --eval '<name>+'       "
 msgstr ""
 
 #: rpmqv.c:410
-msgid "   --macros <file:...>    "
+msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:411
-msgid "use <file:...> instead of default list of macro files"
+#: rpmqv.c:412
+msgid "   --rcfile <file>        "
 msgstr ""
 
-#: rpmqv.c:415
+#: rpmqv.c:417
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:417
+#: rpmqv.c:419
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:429
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:428
+#: rpmqv.c:430
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:429
+#: rpmqv.c:431
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:431
+#: rpmqv.c:433
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:433
+#: rpmqv.c:435
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:435
+#: rpmqv.c:437
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:441
+#: rpmqv.c:443
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:66 rpmqv.c:443
+#: lib/poptQV.c:68 rpmqv.c:445
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:444
+#: rpmqv.c:446
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:445
+#: rpmqv.c:447
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:446
+#: rpmqv.c:448
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:449
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:448
+#: rpmqv.c:450
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:449
+#: rpmqv.c:451
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:450
+#: rpmqv.c:452
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:451
+#: rpmqv.c:453
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:452
+#: rpmqv.c:454
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:453
+#: rpmqv.c:455
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:457
+#: rpmqv.c:459
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:460
+#: rpmqv.c:462
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:476
+#: rpmqv.c:478
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:478
+#: rpmqv.c:480
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:480
+#: rpmqv.c:482
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:482
+#: rpmqv.c:484
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:493
+#: rpmqv.c:495
 msgid "do not execute verify script (if any)"
 msgstr ""
 
-#: rpmqv.c:508
+#: rpmqv.c:510
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:509
+#: rpmqv.c:511
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:518
+#: rpmqv.c:520
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:519
+#: rpmqv.c:521
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: rpmqv.c:539
+#: rpmqv.c:541
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:543
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:546
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:548
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:555
+#: rpmqv.c:557
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:556
+#: rpmqv.c:558
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:563
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:580
+#: rpmqv.c:582
 msgid "   -b<stage> <spec>       "
 msgstr ""
 
-#: rpmqv.c:581
+#: rpmqv.c:583
 msgid "   -t<stage> <tarball>    "
 msgstr ""
 
-#: rpmqv.c:596
+#: rpmqv.c:598
 msgid "package src rpm only"
 msgstr ""
 
-#: rpmqv.c:607
+#: rpmqv.c:609
 msgid "     --buildroot <dir>    "
 msgstr ""
 
-#: rpmqv.c:609
+#: rpmqv.c:611
 msgid "     --target=<platform>+ "
 msgstr ""
 
-#: rpmqv.c:614
+#: rpmqv.c:616
 msgid "   --rebuild <src_pkg>    "
 msgstr ""
 
-#: rpmqv.c:616
+#: rpmqv.c:618
 msgid "   --recompile <src_pkg>  "
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:624
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:624
+#: rpmqv.c:626
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:627
+#: rpmqv.c:629
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:628
+#: rpmqv.c:630
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:641
+#: rpmqv.c:643
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:643
+#: rpmqv.c:645
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:930
+#: rpmqv.c:932
 msgid "Use \"--macros <file:...>\" instead..\n"
 msgstr ""
 
-#: rpmqv.c:1005
+#: rpmqv.c:1007
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1102
+#: rpmqv.c:1104
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1260
+#: rpmqv.c:1262
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1329
+#: rpmqv.c:1331
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1331
+#: rpmqv.c:1333
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:111 build/pack.c:356
+#: build/build.c:113 build/pack.c:355
 msgid "Unable to open temp file."
 msgstr ""
 
-#: build/build.c:190
+#: build/build.c:192
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:196
+#: build/build.c:198
 #, c-format
 msgid "Exec of %s failed (%s): %s"
 msgstr ""
 
-#: build/build.c:204
+#: build/build.c:206
 #, c-format
 msgid "Bad exit status from %s (%s)"
 msgstr ""
 
-#: build/build.c:303
+#: build/build.c:305
 msgid ""
 "\n"
 "\n"
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:207
+#: build/expression.c:208
 msgid "syntax error while parsing =="
 msgstr ""
 
-#: build/expression.c:237
+#: build/expression.c:238
 msgid "syntax error while parsing &&"
 msgstr ""
 
-#: build/expression.c:246
+#: build/expression.c:247
 msgid "syntax error while parsing ||"
 msgstr ""
 
-#: build/expression.c:286
+#: build/expression.c:287
 msgid "parse error in expression"
 msgstr ""
 
-#: build/expression.c:315
+#: build/expression.c:316
 msgid "unmatched ("
 msgstr ""
 
-#: build/expression.c:345
+#: build/expression.c:346
 msgid "- only on numbers"
 msgstr ""
 
-#: build/expression.c:361
+#: build/expression.c:362
 msgid "! only on numbers"
 msgstr ""
 
-#: build/expression.c:400 build/expression.c:445 build/expression.c:500
-#: build/expression.c:587
+#: build/expression.c:401 build/expression.c:446 build/expression.c:501
+#: build/expression.c:590
 msgid "types must match"
 msgstr ""
 
-#: build/expression.c:413
+#: build/expression.c:414
 msgid "* / not suported for strings"
 msgstr ""
 
-#: build/expression.c:461
+#: build/expression.c:462
 msgid "- not suported for strings"
 msgstr ""
 
-#: build/expression.c:600
+#: build/expression.c:603
 msgid "&& and || not suported for strings"
 msgstr ""
 
-#: build/expression.c:634 build/expression.c:682
+#: build/expression.c:637 build/expression.c:685
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:205
+#: build/files.c:206
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:250 build/files.c:332 build/files.c:495
+#: build/files.c:251 build/files.c:333 build/files.c:496
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:261 build/files.c:449 build/files.c:506
+#: build/files.c:262 build/files.c:450 build/files.c:507
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:299 build/files.c:474
+#: build/files.c:300 build/files.c:475
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:348
+#: build/files.c:349
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:386
+#: build/files.c:387
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:396
+#: build/files.c:397
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:408
+#: build/files.c:409
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:532
+#: build/files.c:533
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:542
+#: build/files.c:543
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:667
+#: build/files.c:668
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:673
+#: build/files.c:674
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:701
+#: build/files.c:702
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:714
+#: build/files.c:715
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:726
+#: build/files.c:727
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:816
+#: build/files.c:817
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:925
+#: build/files.c:926
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:1015
+#: build/files.c:1016
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:1025
+#: build/files.c:1026
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1068
+#: build/files.c:1069
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1080
+#: build/files.c:1081
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1154
+#: build/files.c:1155
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1183
+#: build/files.c:1184
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1235
+#: build/files.c:1236
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1244 build/pack.c:101
+#: build/files.c:1245 build/pack.c:100
 #, c-format
 msgid "line: %s"
 msgstr ""
@@ -1695,7 +1665,7 @@ msgstr ""
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1583 build/parsePrep.c:40
+#: build/files.c:1583 build/parsePrep.c:41
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
@@ -1721,486 +1691,501 @@ msgstr ""
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1825
+#: build/files.c:1850
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1853 build/files.c:1863
+#: build/files.c:1878 build/files.c:1892
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1973
+#: build/files.c:2001
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
 
-#: build/names.c:41
+#: build/names.c:42
 msgid "getUname: too many uid's\n"
 msgstr ""
 
-#: build/names.c:67
+#: build/names.c:68
 msgid "getUnameS: too many uid's\n"
 msgstr ""
 
-#: build/names.c:94
+#: build/names.c:95
 msgid "getGname: too many gid's\n"
 msgstr ""
 
-#: build/names.c:120
+#: build/names.c:121
 msgid "getGnameS: too many gid's\n"
 msgstr ""
 
-#: build/names.c:154
+#: build/names.c:155
 #, c-format
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:49
+#: build/pack.c:48
 #, c-format
 msgid "create archive failed on file %s: %s"
 msgstr ""
 
-#: build/pack.c:69
+#: build/pack.c:68
 #, c-format
 msgid "cpio_copy write failed: %s"
 msgstr ""
 
-#: build/pack.c:76
+#: build/pack.c:75
 #, c-format
 msgid "cpio_copy read failed: %s"
 msgstr ""
 
-#: build/pack.c:156
+#: build/pack.c:151
 #, c-format
 msgid "Could not open PreIn file: %s"
 msgstr ""
 
-#: build/pack.c:163
+#: build/pack.c:158
 #, c-format
 msgid "Could not open PreUn file: %s"
 msgstr ""
 
-#: build/pack.c:170
+#: build/pack.c:165
 #, c-format
 msgid "Could not open PostIn file: %s"
 msgstr ""
 
-#: build/pack.c:177
+#: build/pack.c:172
 #, c-format
 msgid "Could not open PostUn file: %s"
 msgstr ""
 
-#: build/pack.c:185
+#: build/pack.c:180
 #, c-format
 msgid "Could not open VerifyScript file: %s"
 msgstr ""
 
-#: build/pack.c:200
+#: build/pack.c:195
 #, c-format
 msgid "Could not open Trigger script file: %s"
 msgstr ""
 
-#: build/pack.c:226
+#: build/pack.c:221
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:236
+#: build/pack.c:231
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:252
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:263
+#: build/pack.c:258
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:368
+#: build/pack.c:367
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:400
+#: build/pack.c:408
+#, c-format
+msgid "Generating signature: %d\n"
+msgstr ""
+
+#: build/pack.c:418
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:433
+#: build/pack.c:455
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:445
+#: build/pack.c:470
 #, c-format
-msgid "Generating signature: %d\n"
+msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:458
+#: build/pack.c:480
 #, c-format
-msgid "Unable to open sigtarget %s: %s"
+msgid "Unable to read header from %s: %s"
 msgstr ""
 
-#: build/pack.c:465
+#: build/pack.c:494
 #, c-format
-msgid "Unable to read sigtarget %s: %s"
+msgid "Unable to write header to %s: %s"
 msgstr ""
 
-#: build/pack.c:471
+#: build/pack.c:504
 #, c-format
-msgid "Unable to write package %s: %s"
+msgid "Unable to read payload from %s: %s"
 msgstr ""
 
-#: build/pack.c:494
+#: build/pack.c:510
+#, c-format
+msgid "Unable to write payload to %s: %s"
+msgstr ""
+
+#: build/pack.c:537
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:560
+#: build/pack.c:602
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:577
+#: build/pack.c:619
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
 
-#: build/parseBuildInstallClean.c:31
+#: build/parseBuildInstallClean.c:28
 #, c-format
 msgid "line %d: second %s"
 msgstr ""
 
-#: build/parseChangelog.c:109
+#: build/parseChangelog.c:110
 msgid "%%changelog entries must start with *"
 msgstr ""
 
-#: build/parseChangelog.c:117
+#: build/parseChangelog.c:118
 msgid "incomplete %%changelog entry"
 msgstr ""
 
-#: build/parseChangelog.c:132
+#: build/parseChangelog.c:133
 msgid "bad date in %%changelog: %s"
 msgstr ""
 
-#: build/parseChangelog.c:137
+#: build/parseChangelog.c:138
 msgid "%%changelog not in decending chronological order"
 msgstr ""
 
-#: build/parseChangelog.c:145 build/parseChangelog.c:156
+#: build/parseChangelog.c:146 build/parseChangelog.c:157
 msgid "missing name in %%changelog"
 msgstr ""
 
-#: build/parseChangelog.c:163
+#: build/parseChangelog.c:164
 msgid "no description in %%changelog"
 msgstr ""
 
-#: build/parseDescription.c:39
+#: build/parseDescription.c:40
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:52 build/parseFiles.c:46 build/parseScript.c:173
+#: build/parseDescription.c:53 build/parseFiles.c:47 build/parseScript.c:182
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
 
-#: build/parseDescription.c:65 build/parseFiles.c:58 build/parseScript.c:186
+#: build/parseDescription.c:66 build/parseFiles.c:59 build/parseScript.c:194
 #, c-format
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:75 build/parseFiles.c:67 build/parseScript.c:196
+#: build/parseDescription.c:76 build/parseFiles.c:68 build/parseScript.c:203
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
 
-#: build/parseDescription.c:87
+#: build/parseDescription.c:88
 #, c-format
 msgid "line %d: Second description"
 msgstr ""
 
-#: build/parseFiles.c:32
+#: build/parseFiles.c:33
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:74
+#: build/parseFiles.c:75
 msgid "line %d: Second %%files list"
 msgstr ""
 
-#: build/parsePreamble.c:149
+#: build/parsePreamble.c:203
 #, c-format
 msgid "Architecture is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:154
+#: build/parsePreamble.c:208
 #, c-format
 msgid "Architecture is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:159
+#: build/parsePreamble.c:213
 #, c-format
 msgid "OS is excluded: %s"
 msgstr ""
 
-#: build/parsePreamble.c:164
+#: build/parsePreamble.c:218
 #, c-format
 msgid "OS is not included: %s"
 msgstr ""
 
-#: build/parsePreamble.c:178
+#: build/parsePreamble.c:232
 #, c-format
 msgid "%s field must be present in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:203
+#: build/parsePreamble.c:257
 #, c-format
 msgid "Duplicate %s entries in package: %s"
 msgstr ""
 
-#: build/parsePreamble.c:251
+#: build/parsePreamble.c:305
 #, c-format
 msgid "Unable to open icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:269
+#: build/parsePreamble.c:323
 #, c-format
 msgid "Unable to read icon %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:282
+#: build/parsePreamble.c:336
 #, c-format
 msgid "Unknown icon type: %s"
 msgstr ""
 
-#: build/parsePreamble.c:345
+#: build/parsePreamble.c:402
 #, c-format
 msgid "line %d: Malformed tag: %s"
 msgstr ""
 
 #. Empty field
-#: build/parsePreamble.c:353
+#: build/parsePreamble.c:410
 #, c-format
 msgid "line %d: Empty tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:375 build/parsePreamble.c:382
+#: build/parsePreamble.c:432 build/parsePreamble.c:439
 #, c-format
 msgid "line %d: Illegal char '-' in %s: %s"
 msgstr ""
 
-#: build/parsePreamble.c:439 build/parseSpec.c:388
+#: build/parsePreamble.c:496 build/parseSpec.c:379
 #, c-format
 msgid "BuildRoot can not be \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:452
+#: build/parsePreamble.c:509
 #, c-format
 msgid "line %d: Prefixes must not end with \"/\": %s"
 msgstr ""
 
-#: build/parsePreamble.c:464
+#: build/parsePreamble.c:521
 #, c-format
 msgid "line %d: Docdir must begin with '/': %s"
 msgstr ""
 
-#: build/parsePreamble.c:476
+#: build/parsePreamble.c:533
 #, c-format
 msgid "line %d: Epoch/Serial field must be a number: %s"
 msgstr ""
 
-#: build/parsePreamble.c:534
+#: build/parsePreamble.c:573 build/parsePreamble.c:584
+#, c-format
+msgid "line %d: Bad %s: qualifiers: %s"
+msgstr ""
+
+#: build/parsePreamble.c:610
 #, c-format
 msgid "line %d: Bad BuildArchitecture format: %s"
 msgstr ""
 
-#: build/parsePreamble.c:543
+#: build/parsePreamble.c:619
 #, c-format
 msgid "Internal error: Bogus tag %d"
 msgstr ""
 
-#: build/parsePreamble.c:681
+#: build/parsePreamble.c:757
 #, c-format
 msgid "Bad package specification: %s"
 msgstr ""
 
-#: build/parsePreamble.c:687
+#: build/parsePreamble.c:763
 #, c-format
 msgid "Package already exists: %s"
 msgstr ""
 
-#: build/parsePreamble.c:714
+#: build/parsePreamble.c:788
 #, c-format
 msgid "line %d: Unknown tag: %s"
 msgstr ""
 
-#: build/parsePreamble.c:739
+#: build/parsePreamble.c:810
 msgid "Spec file can't use BuildRoot"
 msgstr ""
 
-#: build/parsePrep.c:36
+#: build/parsePrep.c:37
 #, c-format
 msgid "Bad source: %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:73
+#: build/parsePrep.c:74
 #, c-format
 msgid "No patch number %d"
 msgstr ""
 
-#: build/parsePrep.c:163
+#: build/parsePrep.c:164
 #, c-format
 msgid "No source number %d"
 msgstr ""
 
-#: build/parsePrep.c:182
+#: build/parsePrep.c:183
 #, c-format
 msgid "Couldn't download nosource %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:276
+#: build/parsePrep.c:277
 msgid "Error parsing %%setup: %s"
 msgstr ""
 
-#: build/parsePrep.c:291
+#: build/parsePrep.c:292
 msgid "line %d: Bad arg to %%setup %c: %s"
 msgstr ""
 
-#: build/parsePrep.c:309
+#: build/parsePrep.c:310
 msgid "line %d: Bad %%setup option %s: %s"
 msgstr ""
 
-#: build/parsePrep.c:442
+#: build/parsePrep.c:443
 msgid "line %d: Need arg to %%patch -b: %s"
 msgstr ""
 
-#: build/parsePrep.c:450
+#: build/parsePrep.c:451
 msgid "line %d: Need arg to %%patch -z: %s"
 msgstr ""
 
-#: build/parsePrep.c:462
+#: build/parsePrep.c:463
 msgid "line %d: Need arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:469
 msgid "line %d: Bad arg to %%patch -p: %s"
 msgstr ""
 
-#: build/parsePrep.c:475
+#: build/parsePrep.c:476
 msgid "Too many patches!"
 msgstr ""
 
-#: build/parsePrep.c:479
+#: build/parsePrep.c:480
 msgid "line %d: Bad arg to %%patch: %s"
 msgstr ""
 
-#: build/parsePrep.c:515
+#: build/parsePrep.c:516
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: build/parseReqs.c:98
+#: build/parseReqs.c:99
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: build/parseReqs.c:109
+#: build/parseReqs.c:110
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:141
+#: build/parseReqs.c:142
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: build/parseReqs.c:171
+#: build/parseReqs.c:172
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""
 
-#: build/parseScript.c:141
+#: build/parseScript.c:151
 #, c-format
 msgid "line %d: triggers must have --: %s"
 msgstr ""
 
-#: build/parseScript.c:151 build/parseScript.c:214
+#: build/parseScript.c:161 build/parseScript.c:219
 #, c-format
 msgid "line %d: Error parsing %s: %s"
 msgstr ""
 
-#: build/parseScript.c:161
+#: build/parseScript.c:171
 #, c-format
 msgid "line %d: script program must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:205
+#: build/parseScript.c:211
 #, c-format
 msgid "line %d: Second %s"
 msgstr ""
 
-#: build/parseSpec.c:138
+#: build/parseSpec.c:133
 #, c-format
 msgid "line %d: %s"
 msgstr ""
 
 #. XXX Fstrerror
-#: build/parseSpec.c:190
+#: build/parseSpec.c:181
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:202
+#: build/parseSpec.c:193
 msgid "Unclosed %%if"
 msgstr ""
 
-#: build/parseSpec.c:273
+#: build/parseSpec.c:264
 #, c-format
 msgid "%s:%d: parseExpressionBoolean returns %d"
 msgstr ""
 
 #. Got an else with no %if !
-#: build/parseSpec.c:281
+#: build/parseSpec.c:272
 msgid "%s:%d: Got a %%else with no if"
 msgstr ""
 
 #. Got an end with no %if !
-#: build/parseSpec.c:292
+#: build/parseSpec.c:283
 msgid "%s:%d: Got a %%endif with no if"
 msgstr ""
 
-#: build/parseSpec.c:306 build/parseSpec.c:315
+#: build/parseSpec.c:297 build/parseSpec.c:306
 msgid "malformed %%include statement"
 msgstr ""
 
-#: build/parseSpec.c:491
+#: build/parseSpec.c:485
 msgid "No buildable architectures"
 msgstr ""
 
-#: build/parseSpec.c:546
+#: build/parseSpec.c:540
 msgid "Package has no %%description: %s"
 msgstr ""
 
-#: build/spec.c:36
+#: build/spec.c:37
 #, c-format
 msgid "archive = %s, fs = %s\n"
 msgstr ""
 
-#: build/spec.c:245
+#: build/spec.c:246
 #, c-format
 msgid "line %d: Bad number: %s"
 msgstr ""
 
-#: build/spec.c:251
+#: build/spec.c:252
 #, c-format
 msgid "line %d: Bad no%s number: %d"
 msgstr ""
 
-#: build/spec.c:310
+#: build/spec.c:311
 #, c-format
 msgid "line %d: Bad %s number: %s\n"
 msgstr ""
@@ -2215,182 +2200,182 @@ msgstr ""
 msgid "can't unlink %s: %s\n"
 msgstr ""
 
-#: lib/cpio.c:756
+#: lib/cpio.c:757
 #, c-format
 msgid "getNextHeader: %s\n"
 msgstr ""
 
-#: lib/cpio.c:1242
+#: lib/cpio.c:1243
 #, c-format
 msgid "(error 0x%x)"
 msgstr ""
 
-#: lib/cpio.c:1245
+#: lib/cpio.c:1246
 msgid "Bad magic"
 msgstr ""
 
-#: lib/cpio.c:1246
+#: lib/cpio.c:1247
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/cpio.c:1264
+#: lib/cpio.c:1265
 msgid "Header size too big"
 msgstr ""
 
-#: lib/cpio.c:1265
+#: lib/cpio.c:1266
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/cpio.c:1266
+#: lib/cpio.c:1267
 msgid "Missing hard link"
 msgstr ""
 
-#: lib/cpio.c:1267
+#: lib/cpio.c:1268
 msgid "MD5 sum mismatch"
 msgstr ""
 
-#: lib/cpio.c:1268
+#: lib/cpio.c:1269
 msgid "Internal error"
 msgstr ""
 
-#: lib/cpio.c:1277
+#: lib/cpio.c:1278
 msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:553
+#: lib/depends.c:564
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:582
+#: lib/depends.c:593
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:936
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:995
+#: lib/depends.c:1006
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1047
+#: lib/depends.c:1058
 #, c-format
 msgid "%s: %-45s %-3s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1066
+#: lib/depends.c:1077
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1083
+#: lib/depends.c:1094
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1105
+#: lib/depends.c:1116
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1118
+#: lib/depends.c:1129
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1132
+#: lib/depends.c:1143
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1164
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1211
+#: lib/depends.c:1222
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1278
+#: lib/depends.c:1289
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1464
+#: lib/depends.c:1515
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1517
+#: lib/depends.c:1619
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1574
+#: lib/depends.c:1669
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1677
+#: lib/depends.c:1772
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1708
+#: lib/depends.c:1803
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
-#: lib/db1.c:102 lib/db3.c:449
+#: lib/db1.c:91 lib/db3.c:451
 #, c-format
 msgid "db%d error(%d)"
 msgstr ""
 
-#: lib/db1.c:104 lib/db3.c:451
+#: lib/db1.c:93 lib/db3.c:453
 #, c-format
 msgid " performing %s"
 msgstr ""
 
-#: lib/db1.c:396
+#: lib/db1.c:388
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:399
+#: lib/db1.c:391
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db1.c:430
+#: lib/db1.c:422
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db1.c:435
+#: lib/db1.c:427
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
 #. XXX check errno validity
-#: lib/db1.c:458
+#: lib/db1.c:450
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "exclusive"
 msgstr ""
 
-#: lib/db1.c:459 lib/db3.c:1112
+#: lib/db1.c:451 lib/db3.c:1114
 msgid "shared"
 msgstr ""
 
@@ -2419,57 +2404,57 @@ msgstr ""
 msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:265
+#: lib/db3.c:267
 #, c-format
 msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db3.c:295
 #, c-format
 msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:301
+#: lib/db3.c:303
 #, c-format
 msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:309
+#: lib/db3.c:311
 #, c-format
 msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:476
+#: lib/db3.c:478
 #, c-format
 msgid "closed  db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:492
+#: lib/db3.c:494
 #, c-format
 msgid "removed db environment %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:529
+#: lib/db3.c:531
 #, c-format
 msgid "opening db environment %s/%s %s\n"
 msgstr ""
 
-#: lib/db3.c:915
+#: lib/db3.c:917
 #, c-format
 msgid "closed  db index       %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1005
+#: lib/db3.c:1007
 #, c-format
 msgid "opening db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:1110
+#: lib/db3.c:1112
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: lib/db3.c:1117
+#: lib/db3.c:1119
 #, c-format
 msgid "locked  db index       %s/%s\n"
 msgstr ""
@@ -2485,125 +2470,111 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:86 lib/formats.c:112 lib/formats.c:141 lib/formats.c:182
-#: lib/header.c:2385 lib/header.c:2402 lib/header.c:2422
+#: lib/header.c:2088 lib/header.c:2104 lib/header.c:2123
 msgid "(not a number)"
 msgstr ""
 
-#: lib/fs.c:67
+#: lib/fs.c:69
 #, c-format
 msgid "mntctl() failed to return fugger size: %s"
 msgstr ""
 
-#: lib/fs.c:102 lib/fs.c:285
+#: lib/fs.c:104 lib/fs.c:287
 #, c-format
 msgid "failed to stat %s: %s"
 msgstr ""
 
-#: lib/fs.c:145
+#: lib/fs.c:147
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/fs.c:150
+#: lib/fs.c:152
 #, c-format
 msgid "failed to open %s: %s"
 msgstr ""
 
-#: lib/fs.c:307
+#: lib/fs.c:309
 #, c-format
 msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:260
+#: lib/header.c:215
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:291 lib/header.c:872 lib/install.c:380
+#: lib/header.c:246 lib/header.c:717 lib/install.c:380
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1268
+#: lib/header.c:1074
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1738
+#: lib/header.c:1481
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1768
+#: lib/header.c:1509
 msgid "missing } after %{"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1782
+#: lib/header.c:1521
 msgid "empty tag format"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1794
+#: lib/header.c:1531
 msgid "empty tag name"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1811
+#: lib/header.c:1546
 msgid "unknown tag"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1838
+#: lib/header.c:1571
 msgid "] expected at end of array"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1856
+#: lib/header.c:1587
 msgid "unexpected ]"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1860
+#: lib/header.c:1589
 msgid "unexpected }"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1920
+#: lib/header.c:1644
 msgid "? expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1929
+#: lib/header.c:1651
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1942 lib/header.c:1983
+#: lib/header.c:1662 lib/header.c:1697
 msgid "} expected in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1952
+#: lib/header.c:1670
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1968
+#: lib/header.c:1684
 msgid "{ expected after : in expression"
 msgstr ""
 
-#. @-observertrans@
-#: lib/header.c:1993
+#: lib/header.c:1705
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:2164
+#: lib/header.c:1870
 msgid "(unknown type)"
 msgstr ""
 
-#: lib/install.c:190 lib/uninstall.c:193
+#: lib/install.c:190 lib/uninstall.c:194
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
@@ -2618,546 +2589,545 @@ msgstr ""
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: lib/install.c:255
+#: lib/install.c:256
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
 #. XXX FIXME: Fclose with libio destroys errno
-#: lib/install.c:657
+#: lib/install.c:665
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: lib/install.c:658
+#: lib/install.c:666
 msgid " on file "
 msgstr ""
 
-#: lib/install.c:707
+#: lib/install.c:715
 msgid "installing a source package\n"
 msgstr ""
 
-#: lib/install.c:727
+#: lib/install.c:735
 #, c-format
 msgid "cannot create sourcedir %s"
 msgstr ""
 
-#: lib/install.c:733 lib/install.c:763
+#: lib/install.c:741 lib/install.c:771
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: lib/install.c:737
+#: lib/install.c:745
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: lib/install.c:757
+#: lib/install.c:765
 #, c-format
 msgid "cannot create specdir %s"
 msgstr ""
 
-#: lib/install.c:767
+#: lib/install.c:775
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: lib/install.c:799 lib/install.c:827
+#: lib/install.c:807 lib/install.c:835
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: lib/install.c:845
+#: lib/install.c:853
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:847 lib/install.c:1119 lib/uninstall.c:42
+#: lib/install.c:855 lib/install.c:1127 lib/uninstall.c:43
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:937
+#: lib/install.c:945
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:982
+#: lib/install.c:990
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:1042
+#: lib/install.c:1050
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1047
+#: lib/install.c:1055
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1079
+#: lib/install.c:1087
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1115
+#: lib/install.c:1123
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1204
+#: lib/install.c:1214
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:280 lib/misc.c:285 lib/misc.c:291
+#: lib/misc.c:281 lib/misc.c:286 lib/misc.c:292
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:61
+#: lib/package.c:85
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:119
+#: lib/package.c:142
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
 
-#: lib/poptBT.c:83
+#: lib/poptBT.c:84
 msgid "buildroot already specified"
 msgstr ""
 
-#: lib/poptBT.c:109
+#: lib/poptBT.c:110
 msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:111
+#: lib/poptBT.c:112
 msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:113
+#: lib/poptBT.c:114
 msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: lib/poptBT.c:115
+#: lib/poptBT.c:116
 msgid "verify %%files section from spec file"
 msgstr ""
 
-#: lib/poptBT.c:117
+#: lib/poptBT.c:118
 msgid "build source and binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:119
+#: lib/poptBT.c:120
 msgid "build binary package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:121
+#: lib/poptBT.c:122
 msgid "build source package from spec file"
 msgstr ""
 
-#: lib/poptBT.c:124
+#: lib/poptBT.c:125
 msgid "build through %%prep stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:126
+#: lib/poptBT.c:127
 msgid "build through %%build stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:128
+#: lib/poptBT.c:129
 msgid "build through %%install stage from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:130
+#: lib/poptBT.c:131
 msgid "verify %%files section from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:132
+#: lib/poptBT.c:133
 msgid "build source and binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:134
+#: lib/poptBT.c:135
 msgid "build binary package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:136
+#: lib/poptBT.c:137
 msgid "build source package from tar ball"
 msgstr ""
 
-#: lib/poptBT.c:139
+#: lib/poptBT.c:140
 msgid "build binary package from source package"
 msgstr ""
 
-#: lib/poptBT.c:141
+#: lib/poptBT.c:142
 msgid "build through %%install stage from source package"
 msgstr ""
 
-#: lib/poptBT.c:144
+#: lib/poptBT.c:145
 msgid "override build root"
 msgstr ""
 
-#: lib/poptBT.c:148
+#: lib/poptBT.c:149
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: lib/poptBT.c:150
+#: lib/poptBT.c:151
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: lib/poptBT.c:154
+#: lib/poptBT.c:155
 msgid "remove specfile when done"
 msgstr ""
 
-#: lib/poptBT.c:158
+#: lib/poptBT.c:159
 msgid "override target platform"
 msgstr ""
 
-#: lib/poptBT.c:160
+#: lib/poptBT.c:161
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: lib/poptQV.c:68
+#: lib/poptQV.c:70
 msgid "query/verify package owning file"
 msgstr ""
 
-#: lib/poptQV.c:70
+#: lib/poptQV.c:72
 msgid "query/verify packages in group"
 msgstr ""
 
-#: lib/poptQV.c:72
+#: lib/poptQV.c:74
 msgid "query/verify a package file"
 msgstr ""
 
-#: lib/poptQV.c:74
+#: lib/poptQV.c:76
 msgid "rpm query mode"
 msgstr ""
 
-#: lib/poptQV.c:78
+#: lib/poptQV.c:80
 msgid "display known query tags"
 msgstr ""
 
-#: lib/poptQV.c:80
+#: lib/poptQV.c:82
 msgid "query a spec file"
 msgstr ""
 
-#: lib/poptQV.c:82
+#: lib/poptQV.c:84
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/poptQV.c:84
+#: lib/poptQV.c:86
 msgid "rpm verify mode"
 msgstr ""
 
-#: lib/poptQV.c:86
+#: lib/poptQV.c:88
 msgid "rpm verify mode (legacy)"
 msgstr ""
 
-#: lib/poptQV.c:88
+#: lib/poptQV.c:90
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/poptQV.c:90
+#: lib/poptQV.c:92
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/poptQV.c:130
+#: lib/poptQV.c:132
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/poptQV.c:132
+#: lib/poptQV.c:134
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/poptQV.c:134
+#: lib/poptQV.c:136
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/poptQV.c:136
+#: lib/poptQV.c:138
 msgid "list files in package"
 msgstr ""
 
-#: lib/poptQV.c:140
+#: lib/poptQV.c:142
 msgid "use the following query format"
 msgstr ""
 
-#: lib/poptQV.c:142
+#: lib/poptQV.c:144
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/poptQV.c:144
+#: lib/poptQV.c:146
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/poptQV.c:146
+#: lib/poptQV.c:148
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/problems.c:80
+#: lib/problems.c:81
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:84
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:103
+#: lib/problems.c:99
 #, c-format
-msgid "package %s-%s-%s is for a different architecture"
+msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:108
+#: lib/problems.c:103
 #, c-format
-msgid "package %s-%s-%s is for a different operating system"
+msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:113
+#: lib/problems.c:107
 #, c-format
-msgid "package %s-%s-%s is already installed"
+msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:118
+#: lib/problems.c:111
 #, c-format
-msgid "path %s is not relocateable for package %s-%s-%s"
+msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:123
+#: lib/problems.c:116
 #, c-format
-msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s"
+msgid "file %s conflicts between attemped installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:129
+#: lib/problems.c:121
 #, c-format
-msgid ""
-"file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s"
+msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:135
+#: lib/problems.c:126
 #, c-format
-msgid "package %s-%s-%s (which is newer than %s-%s-%s) is already installed"
+msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:131
 #, c-format
-msgid "installing package %s-%s-%s needs %ld%cb on the %s filesystem"
+msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:141
 #, c-format
-msgid "installing package %s-%s-%s needs %ld inodes on the %s filesystem"
+msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:158
+#: lib/problems.c:146
 #, c-format
-msgid "package %s-%s-%s pre-transaction syscall(s): %s failed: %s"
+msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:166
+#: lib/problems.c:153
 #, c-format
-msgid "unknown error %d encountered while manipulating package %s-%s-%s"
+msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/query.c:150
+#: lib/query.c:151
 #, c-format
 msgid "error in format: %s\n"
 msgstr ""
 
-#: lib/query.c:212
+#: lib/query.c:213
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:271
+#: lib/query.c:272
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:273
+#: lib/query.c:274
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:275
+#: lib/query.c:276
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:277
+#: lib/query.c:278
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:279
+#: lib/query.c:280
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:283
+#: lib/query.c:284
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:300 lib/query.c:343
+#: lib/query.c:301 lib/query.c:344
 msgid "package has neither file owner or id lists"
 msgstr ""
 
-#: lib/query.c:387
+#: lib/query.c:388
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:503
+#: lib/query.c:504
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:521
+#: lib/query.c:522
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:530 lib/rpminstall.c:311
+#: lib/query.c:531 lib/rpminstall.c:312
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:534
+#: lib/query.c:535
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:567
+#: lib/query.c:568
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:590
+#: lib/query.c:591
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:600
+#: lib/query.c:601
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:610
+#: lib/query.c:611
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:620
+#: lib/query.c:621
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:631
+#: lib/query.c:632
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:661
+#: lib/query.c:662
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:664
+#: lib/query.c:665
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:690
+#: lib/query.c:691
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:693
+#: lib/query.c:694
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:697
+#: lib/query.c:698
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:708 lib/rpminstall.c:545
+#: lib/query.c:709 lib/rpminstall.c:546
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:37
+#: lib/rpmchecksig.c:38
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:48
+#: lib/rpmchecksig.c:49
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:80
+#: lib/rpmchecksig.c:81
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:86
+#: lib/rpmchecksig.c:87
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:119 lib/rpmchecksig.c:249
+#: lib/rpmchecksig.c:131 lib/rpmchecksig.c:265
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:124
+#: lib/rpmchecksig.c:136
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:128
+#: lib/rpmchecksig.c:140
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:136 lib/rpmchecksig.c:263
+#: lib/rpmchecksig.c:148 lib/rpmchecksig.c:279
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:140 lib/rpmchecksig.c:268
+#: lib/rpmchecksig.c:152 lib/rpmchecksig.c:284
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:185
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:179
+#: lib/rpmchecksig.c:191
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:255
+#: lib/rpmchecksig.c:271
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:418
+#: lib/rpmchecksig.c:434
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:419 lib/rpmchecksig.c:433
+#: lib/rpmchecksig.c:435 lib/rpmchecksig.c:449
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:421 lib/rpmchecksig.c:435
+#: lib/rpmchecksig.c:437 lib/rpmchecksig.c:451
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:422 lib/rpmchecksig.c:436
+#: lib/rpmchecksig.c:438 lib/rpmchecksig.c:452
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:424 lib/rpmchecksig.c:438
+#: lib/rpmchecksig.c:440 lib/rpmchecksig.c:454
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:432
+#: lib/rpmchecksig.c:448
 msgid "OK"
 msgstr ""
 
@@ -3231,7 +3201,7 @@ msgstr ""
 msgid "error(%d) removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:772 lib/rpmdb.c:2305
+#: lib/rpmdb.c:772 lib/rpmdb.c:2351
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3242,511 +3212,506 @@ msgid ""
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:1082
+#: lib/rpmdb.c:1083
 #, c-format
 msgid "error(%d) counting packages"
 msgstr ""
 
-#: lib/rpmdb.c:1141 lib/rpmdb.c:1675
+#: lib/rpmdb.c:1142 lib/rpmdb.c:1686
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1728
+#: lib/rpmdb.c:1739
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1739
+#: lib/rpmdb.c:1750
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1748
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1890
+#: lib/rpmdb.c:1901
 #, c-format
 msgid "error(%d) allocating new package instance"
 msgstr ""
 
-#: lib/rpmdb.c:1947
+#: lib/rpmdb.c:1964
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1963
+#: lib/rpmdb.c:1980
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1972
+#: lib/rpmdb.c:1989
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:2330
+#: lib/rpmdb.c:2376
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2334
+#: lib/rpmdb.c:2380
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2386
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2342
+#: lib/rpmdb.c:2388
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2349
+#: lib/rpmdb.c:2395
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2360
+#: lib/rpmdb.c:2406
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2383
+#: lib/rpmdb.c:2429
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2415
+#: lib/rpmdb.c:2466
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2433
+#: lib/rpmdb.c:2484
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2441
+#: lib/rpmdb.c:2492
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2443
+#: lib/rpmdb.c:2494
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2453
+#: lib/rpmdb.c:2504
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2455
+#: lib/rpmdb.c:2506
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:141
+#: lib/rpminstall.c:142
 msgid "Preparing..."
 msgstr ""
 
-#: lib/rpminstall.c:144
+#: lib/rpminstall.c:145
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:205
+#: lib/rpminstall.c:206
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:209
+#: lib/rpminstall.c:210
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:214
+#: lib/rpminstall.c:215
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:229
+#: lib/rpminstall.c:230
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:244
+#: lib/rpminstall.c:245
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:254
+#: lib/rpminstall.c:255
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:258
+#: lib/rpminstall.c:259
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:285
+#: lib/rpminstall.c:286
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:297 lib/rpminstall.c:469
+#: lib/rpminstall.c:298 lib/rpminstall.c:470
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:315 lib/rpminstall.c:610
+#: lib/rpminstall.c:316 lib/rpminstall.c:611
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:330
+#: lib/rpminstall.c:331
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:350
+#: lib/rpminstall.c:351
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:395
+#: lib/rpminstall.c:396
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:400
+#: lib/rpminstall.c:401
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:417
+#: lib/rpminstall.c:418
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:428
+#: lib/rpminstall.c:429
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:449
+#: lib/rpminstall.c:450
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:548
+#: lib/rpminstall.c:533
+#, c-format
+msgid "cannot open %s/packages.rpm\n"
+msgstr ""
+
+#: lib/rpminstall.c:549
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:571
+#: lib/rpminstall.c:572
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:599
+#: lib/rpminstall.c:600
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:605
+#: lib/rpminstall.c:606
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmlead.c:52
+#: lib/rpmlead.c:48
 #, c-format
 msgid "read failed: %s (%d)"
 msgstr ""
 
-#: lib/rpmrc.c:147
+#: lib/rpmrc.c:150
 #, c-format
 msgid "missing second ':' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:150
+#: lib/rpmrc.c:153
 #, c-format
 msgid "missing architecture name at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:310
+#: lib/rpmrc.c:313
 #, c-format
 msgid "Incomplete data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:314
+#: lib/rpmrc.c:317
 #, c-format
 msgid "Too many args in data line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:321
+#: lib/rpmrc.c:324
 #, c-format
 msgid "Bad arch/os number: %s (%s:%d)"
 msgstr ""
 
-#: lib/rpmrc.c:356
+#: lib/rpmrc.c:359
 #, c-format
 msgid "Incomplete default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:361
+#: lib/rpmrc.c:364
 #, c-format
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:551
+#: lib/rpmrc.c:554
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: lib/rpmrc.c:556
+#: lib/rpmrc.c:559
 #, c-format
 msgid "Cannot read %s, HOME is too large."
 msgstr ""
 
-#: lib/rpmrc.c:573
+#: lib/rpmrc.c:576
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
 #. XXX Feof(fd)
-#: lib/rpmrc.c:618
+#: lib/rpmrc.c:621
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: lib/rpmrc.c:655
+#: lib/rpmrc.c:658
 #, c-format
 msgid "missing ':' (found 0x%02x) at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:672 lib/rpmrc.c:746
+#: lib/rpmrc.c:675 lib/rpmrc.c:749
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:689 lib/rpmrc.c:711
+#: lib/rpmrc.c:692 lib/rpmrc.c:714
 #, c-format
 msgid "%s expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: lib/rpmrc.c:698
+#: lib/rpmrc.c:701
 #, c-format
 msgid "cannot open %s at %s:%d: %s"
 msgstr ""
 
-#: lib/rpmrc.c:738
+#: lib/rpmrc.c:741
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:805
+#: lib/rpmrc.c:808
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: lib/rpmrc.c:1202
+#: lib/rpmrc.c:1205
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: lib/rpmrc.c:1203
+#: lib/rpmrc.c:1206
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:114
-#, c-format
-msgid "sigsize         : %d\n"
-msgstr ""
-
 #: lib/signature.c:115
-#, c-format
-msgid "Header + Archive: %d\n"
+msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:116
+#: lib/signature.c:119
 #, c-format
-msgid "expected size   : %d\n"
+msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:120
-msgid "file is not regular -- skipping size check\n"
+#: lib/signature.c:123
+#, c-format
+msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:139
+#: lib/signature.c:142
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:143
+#: lib/signature.c:146
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:154
-msgid "Old (internal-only) signature!  How did you get that!?"
-msgstr ""
-
 #: lib/signature.c:157
-msgid "New Header signature\n"
+msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#. 8-byte pad
-#: lib/signature.c:164 lib/signature.c:201
+#: lib/signature.c:210
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: lib/signature.c:165 lib/signature.c:202
+#: lib/signature.c:211
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: lib/signature.c:265
+#: lib/signature.c:273
 #, c-format
 msgid "Couldn't exec pgp (%s)"
 msgstr ""
 
-#: lib/signature.c:276
+#: lib/signature.c:284
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:283
+#: lib/signature.c:291
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: lib/signature.c:288
+#: lib/signature.c:296
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:376
+#: lib/signature.c:307 lib/signature.c:384
 msgid "unable to read the signature"
 msgstr ""
 
-#: lib/signature.c:304
+#: lib/signature.c:312
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:342 lib/signature.c:687
+#: lib/signature.c:350 lib/signature.c:695
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: lib/signature.c:353
+#: lib/signature.c:361
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:360
+#: lib/signature.c:368
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: lib/signature.c:365
+#: lib/signature.c:373
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:381
+#: lib/signature.c:389
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:416
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:493 lib/signature.c:555
+#: lib/signature.c:501 lib/signature.c:563
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: lib/signature.c:553 lib/signature.c:626
+#: lib/signature.c:561 lib/signature.c:634
 msgid "exec failed!\n"
 msgstr ""
 
-#: lib/signature.c:628
+#: lib/signature.c:636
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: lib/signature.c:716
+#: lib/signature.c:724
 msgid "Couldn't exec pgp"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:720 lib/signature.c:773
+#: lib/signature.c:728 lib/signature.c:781
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: lib/signature.c:753
+#: lib/signature.c:761
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: lib/signature.c:765
+#: lib/signature.c:773
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:423
+#: lib/transaction.c:496
 #, c-format
 msgid "excluding file %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:449 lib/transaction.c:532
+#: lib/transaction.c:522 lib/transaction.c:605
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:454
+#: lib/transaction.c:527
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:525
+#: lib/transaction.c:598
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:677
+#: lib/transaction.c:749
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
-#: lib/uninstall.c:56
+#: lib/uninstall.c:57
 #, c-format
 msgid "cannot remove %s - directory not empty"
 msgstr ""
 
-#: lib/uninstall.c:60
+#: lib/uninstall.c:61
 #, c-format
 msgid "rmdir of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:70
+#: lib/uninstall.c:71
 #, c-format
 msgid "removal of %s failed: %s"
 msgstr ""
 
-#: lib/uninstall.c:133
+#: lib/uninstall.c:134
 #, c-format
 msgid "will remove files test = %d\n"
 msgstr ""
 
-#: lib/uninstall.c:217
+#: lib/uninstall.c:218
 msgid "running postuninstall script (if any)\n"
 msgstr ""
 
-#: lib/uninstall.c:418
+#: lib/uninstall.c:419
 #, c-format
 msgid "execution of %s-%s-%s script failed, exit status %d"
 msgstr ""
@@ -3773,205 +3738,205 @@ msgstr ""
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: rpmio/rpmio.c:538
+#: rpmio/rpmio.c:534
 msgid "Success"
 msgstr ""
 
-#: rpmio/rpmio.c:541
+#: rpmio/rpmio.c:537
 msgid "Bad server response"
 msgstr ""
 
-#: rpmio/rpmio.c:544
+#: rpmio/rpmio.c:540
 msgid "Server IO error"
 msgstr ""
 
-#: rpmio/rpmio.c:547
+#: rpmio/rpmio.c:543
 msgid "Server timeout"
 msgstr ""
 
-#: rpmio/rpmio.c:550
+#: rpmio/rpmio.c:546
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: rpmio/rpmio.c:553
+#: rpmio/rpmio.c:549
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: rpmio/rpmio.c:556
+#: rpmio/rpmio.c:552
 msgid "Failed to connect to server"
 msgstr ""
 
-#: rpmio/rpmio.c:559
+#: rpmio/rpmio.c:555
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: rpmio/rpmio.c:562
+#: rpmio/rpmio.c:558
 msgid "IO error to local file"
 msgstr ""
 
-#: rpmio/rpmio.c:565
+#: rpmio/rpmio.c:561
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: rpmio/rpmio.c:568
+#: rpmio/rpmio.c:564
 msgid "File not found on server"
 msgstr ""
 
-#: rpmio/rpmio.c:571
+#: rpmio/rpmio.c:567
 msgid "Abort in progress"
 msgstr ""
 
-#: rpmio/rpmio.c:575
+#: rpmio/rpmio.c:571
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: rpmio/rpmio.c:1170
+#: rpmio/rpmio.c:1166
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: rpmio/macro.c:189
+#: rpmio/macro.c:187
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: rpmio/macro.c:303
+#: rpmio/macro.c:301
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: rpmio/macro.c:344
+#: rpmio/macro.c:342
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:557
+#: rpmio/macro.c:555
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: rpmio/macro.c:583
+#: rpmio/macro.c:581
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: rpmio/macro.c:589
+#: rpmio/macro.c:587
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: rpmio/macro.c:594
+#: rpmio/macro.c:592
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: rpmio/macro.c:599
+#: rpmio/macro.c:597
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: rpmio/macro.c:630
+#: rpmio/macro.c:628
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: rpmio/macro.c:723
+#: rpmio/macro.c:721
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: rpmio/macro.c:816
+#: rpmio/macro.c:814
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: rpmio/macro.c:995
+#: rpmio/macro.c:993
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: rpmio/macro.c:1061 rpmio/macro.c:1077
+#: rpmio/macro.c:1059 rpmio/macro.c:1075
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: rpmio/macro.c:1117
+#: rpmio/macro.c:1115
 msgid "A %% is followed by an unparseable macro"
 msgstr ""
 
-#: rpmio/macro.c:1243
+#: rpmio/macro.c:1241
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: rpmio/macro.c:1314
+#: rpmio/macro.c:1312
 msgid "Target buffer overflow"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/macro.c:1494 rpmio/macro.c:1500
+#: rpmio/macro.c:1492 rpmio/macro.c:1498
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: rpmio/macro.c:1503
+#: rpmio/macro.c:1501
 #, c-format
-msgid "File %s is smaller than %d bytes"
+msgid "File %s is smaller than %u bytes"
 msgstr ""
 
-#: rpmio/rpmlog.c:25
+#: rpmio/rpmlog.c:24
 msgid "(no error)"
 msgstr ""
 
 #. !< RPMLOG_EMERG
-#: rpmio/rpmlog.c:84 rpmio/rpmlog.c:85 rpmio/rpmlog.c:86
+#: rpmio/rpmlog.c:83 rpmio/rpmlog.c:84 rpmio/rpmlog.c:85
 msgid "fatal error: "
 msgstr ""
 
 #. !< RPMLOG_CRIT
-#: rpmio/rpmlog.c:87
+#: rpmio/rpmlog.c:86
 msgid "error: "
 msgstr ""
 
 #. !< RPMLOG_ERR
-#: rpmio/rpmlog.c:88
+#: rpmio/rpmlog.c:87
 msgid "warning: "
 msgstr ""
 
-#: rpmio/rpmmalloc.c:13
+#: rpmio/rpmmalloc.c:14
 #, c-format
 msgid "memory alloc (%u bytes) returned NULL.\n"
 msgstr ""
 
-#: rpmio/url.c:95
+#: rpmio/url.c:91
 #, c-format
 msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:114
+#: rpmio/url.c:110
 #, c-format
 msgid "warning: u %p data %p nrefs != 0 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:142
+#: rpmio/url.c:138
 #, c-format
 msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n"
 msgstr ""
 
-#: rpmio/url.c:228
+#: rpmio/url.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: rpmio/url.c:252 rpmio/url.c:278
+#: rpmio/url.c:248 rpmio/url.c:274
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:416
+#: rpmio/url.c:412
 msgid "url port must be a number\n"
 msgstr ""
 
-#: rpmio/url.c:456
+#: rpmio/url.c:452
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: rpmio/url.c:473
+#: rpmio/url.c:469
 #, c-format
 msgid "failed to create %s: %s\n"
 msgstr ""
diff --git a/popt/po/cs.po b/popt/po/cs.po
index 7b69957e4..77c532fbf 100644
--- a/popt/po/cs.po
+++ b/popt/po/cs.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
-"PO-Revision-Date: 2000-08-08 22:36+0100\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/popt/po/da.po b/popt/po/da.po
index 104d51808..13c863877 100644
--- a/popt/po/da.po
+++ b/popt/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/popt/po/de.po b/popt/po/de.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/de.po
+++ b/popt/po/de.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/es.po b/popt/po/es.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/es.po
+++ b/popt/po/es.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/fi.po b/popt/po/fi.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/fi.po
+++ b/popt/po/fi.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/fr.po b/popt/po/fr.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/fr.po
+++ b/popt/po/fr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/gl.po b/popt/po/gl.po
index a3eeb9f9a..dd2b14a7a 100644
--- a/popt/po/gl.po
+++ b/popt/po/gl.po
@@ -9,8 +9,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/popt/po/hu.po b/popt/po/hu.po
index a91e74a89..f7117ba64 100644
--- a/popt/po/hu.po
+++ b/popt/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: László Németh <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/popt/po/id.po b/popt/po/id.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/id.po
+++ b/popt/po/id.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/is.po b/popt/po/is.po
index efb524d38..1fe522942 100644
--- a/popt/po/is.po
+++ b/popt/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.0\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/popt/po/it.po b/popt/po/it.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/it.po
+++ b/popt/po/it.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/ja.po b/popt/po/ja.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/ja.po
+++ b/popt/po/ja.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/ko.po b/popt/po/ko.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/ko.po
+++ b/popt/po/ko.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/no.po b/popt/po/no.po
index 03e9aece7..84a4cf9b4 100644
--- a/popt/po/no.po
+++ b/popt/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 7.0\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/popt/po/pl.po b/popt/po/pl.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/pl.po
+++ b/popt/po/pl.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/pt.po b/popt/po/pt.po
index dfc1c38a8..c6ae4f25f 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: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/popt/po/pt_BR.po b/popt/po/pt_BR.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/pt_BR.po
+++ b/popt/po/pt_BR.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/ro.po b/popt/po/ro.po
index 8f2b40d8b..c6cec5b59 100644
--- a/popt/po/ro.po
+++ b/popt/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/popt/po/ru.po b/popt/po/ru.po
index 8f7869f91..fa1e91c73 100644
--- a/popt/po/ru.po
+++ b/popt/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/popt/po/sk.po b/popt/po/sk.po
index d142fcaa6..a3b29ae61 100644
--- a/popt/po/sk.po
+++ b/popt/po/sk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/popt/po/sl.po b/popt/po/sl.po
index 6e3a15bbb..7330b89d6 100644
--- a/popt/po/sl.po
+++ b/popt/po/sl.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-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"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"PO-Revision-Date: 2000-09-05 12:30+0200\n"
+"Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:27
 msgid "Show this help message"
-msgstr ""
+msgstr "Prika¾i to sporoèilo s pomoèjo"
 
 #: popthelp.c:28
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Prika¾i kratko sporoèilo o uporabi"
diff --git a/popt/po/sr.po b/popt/po/sr.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/sr.po
+++ b/popt/po/sr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/sv.po b/popt/po/sv.po
index 01afba923..e27bcff22 100644
--- a/popt/po/sv.po
+++ b/popt/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index 9fc0f99b6..2b144bf46 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -1,17 +1,12 @@
-# -------------------------------------------------------
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Fatih Demir <kabalak@gmx.net>, 2000.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
-"Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
-"Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
+"Last-Translator: Görkem Çetin <kabalak@gmx.net>\n"
+"Language-Team: Gelecek A.Ş <gorkem@gelecek.com.tr>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-9\n"
+"Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:27
@@ -21,244 +16,3 @@ msgstr "Bu yardım iletisini gösterir"
 #: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Kısa bir kullanım iletisi göster"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "       "
-#~ msgstr ""
-#~ "\n"
-#~ "       "
-
-#~ msgid ""
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "  %-*s   "
-#~ msgstr "  %-*s   "
-
-#~ msgid "  %s\n"
-#~ msgstr "  %s\n"
-
-#~ msgid " %s"
-#~ msgstr " %s"
-
-#~ msgid " %s\n"
-#~ msgstr " %s\n"
-
-#~ msgid " [-%s%s%s%s]"
-#~ msgstr " [-%s%s%s%s]"
-
-#~ msgid " [-%s]"
-#~ msgstr " [-%s]"
-
-#~ msgid " arg3: %d"
-#~ msgstr " arg3: %d"
-
-#~ msgid " inc: %d"
-#~ msgstr " inc: %d"
-
-#~ msgid " rest:"
-#~ msgstr " rest:"
-
-#~ msgid " short: %d"
-#~ msgstr " short: %d"
-
-#~ msgid ""
-#~ "%%.%ds\n"
-#~ "%%%ds"
-#~ msgstr ""
-#~ "%%.%ds\n"
-#~ "%%%ds"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s/%s"
-#~ msgstr "%s/%s"
-
-#~ msgid "(none)"
-#~ msgstr "(yok)"
-
-#~ msgid "-"
-#~ msgstr "-"
-
-#~ msgid "-%c"
-#~ msgstr "-%c"
-
-#~ msgid "-%c, --%s"
-#~ msgstr "-%c, --%s"
-
-#~ msgid "--"
-#~ msgstr "--"
-
-#~ msgid "--%s"
-#~ msgstr "--%s"
-
-#~ msgid "./test-poptrc"
-#~ msgstr "./test-poptrc"
-
-#~ msgid "/.popt"
-#~ msgstr "/.popt"
-
-#~ msgid "/etc/popt"
-#~ msgstr "/etc/popt"
-
-#~ msgid ";"
-#~ msgstr ";"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "A third argument"
-#~ msgstr "Üçüncü seçenek"
-
-#~ msgid "ANARG"
-#~ msgstr "BIRSECENEK"
-
-#~ msgid "ARG"
-#~ msgstr "SECENEK"
-
-#~ msgid "An included argument"
-#~ msgstr "Dahil olan bir seçenek"
-
-#~ msgid "Another argument"
-#~ msgstr "Bir başka seçenek"
-
-#~ msgid "Callback arguments"
-#~ msgstr "Geri-verim seçenekleri"
-
-#~ msgid ""
-#~ "First argument with a really long description. After all, we have to test "
-#~ "argument help wrapping somehow, right?"
-#~ msgstr ""
-#~ "Ilk uzun anlatımllı seçenek . Herşey'den sonra , yardımiletisinin kırını "
-#~ "göstermek zorundayız , değil mi ?"
-
-#~ msgid "13ME"
-#~ msgstr "13ME"
-
-#~ msgid "Needs a single -"
-#~ msgstr "Tek bir - bekler"
-
-#~ msgid "PATH"
-#~ msgstr "PATH"
-
-#~ msgid "POSIXLY_CORRECT"
-#~ msgstr "POSIXLY_CORRECT"
-
-#~ msgid "POSIX_ME_HARDER"
-#~ msgstr "POSIX_ME_HARDER"
-
-#~ msgid "Test argument callbacks"
-#~ msgstr "Deneme seçeneklerinin geri-verimleri"
-
-#~ msgid "This shouldn't show up"
-#~ msgstr "Bu ileti sana çıkmaması lazım"
-
-#~ msgid "UNUSED"
-#~ msgstr "UNUSED"
-
-#~ msgid "Unused option for help testing"
-#~ msgstr "Yardımı denemek için kullanılan bir avare seçenek"
-
-#~ msgid "Usage:"
-#~ msgstr "Kullanım :"
-
-#~ msgid "[OPTION...]"
-#~ msgstr "[SECENEK ... ]"
-
-#~ msgid "alias"
-#~ msgstr "nam-ı diğer"
-
-#~ msgid "aliases nested too deeply"
-#~ msgstr "nam-ı diğer işini de abarttın , ha"
-
-#~ msgid "arg for cb2"
-#~ msgstr "cb1 için seçenekler"
-
-#~ msgid "arg1"
-#~ msgstr "seçenek1"
-
-#~ msgid "arg1: %d arg2: %s"
-#~ msgstr "seçenek1: %d seçenek2: %s"
-
-#~ msgid "arg2"
-#~ msgstr "seçenek2"
-
-#~ msgid "arg3"
-#~ msgstr "seçenek3"
-
-#~ msgid "callback: %c %s %s "
-#~ msgstr "geri-verim: %c %s %s"
-
-#~ msgid "cb"
-#~ msgstr "cb"
-
-#~ msgid "cb2"
-#~ msgstr "cb2"
-
-#~ msgid "error in paramter quoting"
-#~ msgstr "veri veriminde hata oluştu"
-
-#~ msgid "exec"
-#~ msgstr "exec"
-
-#~ msgid "help"
-#~ msgstr "yardım"
-
-#~ msgid "hidden"
-#~ msgstr "gizli"
-
-#~ msgid "inc"
-#~ msgstr "inc"
-
-#~ msgid "invalid numeric value"
-#~ msgstr "geçersiz sayısal işlem"
-
-#~ msgid "long"
-#~ msgstr "long"
-
-#~ msgid "missing argument"
-#~ msgstr "eksik seçenek argümanı"
-
-#~ msgid "number too large or too small"
-#~ msgstr "sayı çok fazla uzun/kısa"
-
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "(%d) seçenek türü popt'de tanınmıyor\n"
-
-#~ msgid "sampledata"
-#~ msgstr "denemebilgisi"
-
-#~ msgid "shortoption"
-#~ msgstr "kısaseçenek"
-
-#~ msgid "test1"
-#~ msgstr "deneme_no1"
-
-#~ msgid "test1: bad argument %s: %s\n"
-#~ msgstr "deneme_no1:  kötü seçenek %s: %s\n"
-
-#~ msgid "unknown errno"
-#~ msgstr "tanınmayan hata numarası"
-
-#~ msgid "unknown error"
-#~ msgstr "tanınmayan hata"
-
-#~ msgid "unknown option"
-#~ msgstr "tanınmayan seçenek"
-
-#~ msgid "unused"
-#~ msgstr "kullanılmıyor"
-
-#~ msgid "usage"
-#~ msgstr "kullanım"
diff --git a/popt/po/uk.po b/popt/po/uk.po
index 0f0316eac..41d49b0b8 100644
--- a/popt/po/uk.po
+++ b/popt/po/uk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/popt/po/wa.po b/popt/po/wa.po
index efcfea86c..e0c3f4e68 100644
--- a/popt/po/wa.po
+++ b/popt/po/wa.po
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/popt/po/zh.po b/popt/po/zh.po
index 6e3a15bbb..1d906ea76 100644
--- a/popt/po/zh.po
+++ b/popt/po/zh.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/po/zh_CN.GB2312.po b/popt/po/zh_CN.GB2312.po
index d985660a5..523cea625 100644
--- a/popt/po/zh_CN.GB2312.po
+++ b/popt/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kcmkpanel\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 197fa4473..6db5448a1 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -80,6 +80,7 @@ static PyObject * rpmtransAdd(rpmtransObject * s, PyObject * args);
 static PyObject * rpmtransRemove(rpmtransObject * s, PyObject * args);
 static PyObject * rpmtransDepCheck(rpmtransObject * s, PyObject * args);
 static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args);
+static PyObject * py_rpmtransGetKeys(rpmtransObject * s, PyObject * args);
 static PyObject * rpmtransOrder(rpmtransObject * s, PyObject * args);
 static void rpmtransDealloc(PyObject * o);
 static PyObject * rpmtransGetAttr(rpmtransObject * o, char * name);
@@ -268,6 +269,7 @@ static struct PyMethodDef rpmtransMethods[] = {
 	{"depcheck",	(PyCFunction) rpmtransDepCheck,	1 },
 	{"order",	(PyCFunction) rpmtransOrder,	1 },
 	{"run",		(PyCFunction) rpmtransRun, 1 },
+	{"getKeys",	(PyCFunction) py_rpmtransGetKeys, 1 },
 	{NULL,		NULL}		/* sentinel */
 };
 
@@ -1663,13 +1665,14 @@ struct tsCallbackType {
 
 
 
-static void * tsCallback(const Header h, const rpmCallbackType what,
+static void * tsCallback(const void * hd, const rpmCallbackType what,
 		         const unsigned long amount, const unsigned long total,
-	                 const void * pkgKey, void * data) {
+	                 const void * pkgKey, rpmCallbackData data) {
     struct tsCallbackType * cbInfo = data;
     PyObject * args, * result;
     int fd;
     static FD_t fdt;
+    const Header h = (Header) hd;
 
     if (cbInfo->pythonError) return NULL;
 
@@ -1751,6 +1754,30 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args) {
     return list;
 }
 
+static PyObject * py_rpmtransGetKeys(rpmtransObject * s, PyObject * args) {
+    const void **data = NULL;
+    int num, i;
+    PyObject *tuple;
+
+    rpmtransGetKeys(s->ts, &data, &num);
+    if (data == NULL) {
+	Py_INCREF(Py_None);
+	return Py_None;
+    }
+
+    tuple = PyTuple_New(num);
+
+    for (i = 0; i < num; i++) {
+	PyObject *obj = (PyObject *) data[i];
+	Py_INCREF(obj);
+	PyTuple_SetItem(tuple, i, obj);
+    }
+
+    free (data);
+
+    return tuple;
+}
+
 static PyObject * archScore(PyObject * self, PyObject * args) {
     char * arch;
     int score;
diff --git a/rpm.c b/rpm.c
index ec1ef0ce0..c63b9e168 100755
--- a/rpm.c
+++ b/rpm.c
@@ -6,6 +6,7 @@
 #include "build.h"
 #include "install.h"
 #include "signature.h"
+#include "debug.h"
 
 #define GETOPT_ADDSIGN		1005
 #define GETOPT_RESIGN		1006
@@ -655,7 +656,7 @@ int main(int argc, const char ** argv)
 
     poptResetContext(optCon);
 
-    if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
+    if (qva->qva_queryFormat) free((void *)qva->qva_queryFormat);
     memset(qva, 0, sizeof(*qva));
     qva->qva_source = RPMQV_PACKAGE;
     qva->qva_mode = ' ';
@@ -748,7 +749,7 @@ int main(int argc, const char ** argv)
 	  case GETOPT_EVALMACRO:
 	  { const char *val = rpmExpand(optArg, NULL);
 	    fprintf(stdout, "%s\n", val);
-	    xfree(val);
+	    free((void *)val);
 	    noUsageMsg = 1;
 	  } break;
 
@@ -1197,7 +1198,7 @@ int main(int argc, const char ** argv)
     freeNames();
     freeFilesystems();
     urlFreeCache();
-    if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
+    if (qva->qva_queryFormat) free((void *)qva->qva_queryFormat);
 
 #if HAVE_MCHECK_H && HAVE_MTRACE
     muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
diff --git a/rpm.spec.in b/rpm.spec.in
index 4d29b3c95..815b1a801 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -1,6 +1,8 @@
 %define	with_python_subpackage	@WITH_PYTHON_SUBPACKAGE@
 %define	with_bzip2		@WITH_BZIP2@
 %define	with_apidocs		@WITH_APIDOCS@
+%define strip_binaries		0
+%define	__spec_install_post	:
 
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
 %define	_noPayloadPrefix	1
@@ -12,13 +14,13 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version @VERSION@
 Version: %{version}
-Release: 0.15
+Release: 0.1
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
 Conflicts: patch < 2.5
 %ifos linux
-Prereq: gawk fileutils textutils sh-utils mktemp
+Prereq: gawk fileutils textutils mktemp
 Requires: popt
 %endif
 
@@ -128,14 +130,19 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 
 mkdir -p $RPM_BUILD_ROOT/etc/rpm
 cat << E_O_F > $RPM_BUILD_ROOT/etc/rpm/macros.db1
-%_dbpath		1
-%_dbpath_rebuild	1
+%%_dbapi		1
 E_O_F
 
+%if %{strip_binaries}
 { cd $RPM_BUILD_ROOT
   strip ./bin/rpm
   strip .%{__prefix}/bin/rpm2cpio
 }
+%endif
+
+%if %{with_apidocs}
+gzip -9n apidocs/man/* || :
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,13 +161,16 @@ fi
 %post
 %ifos linux
 /sbin/ldconfig
-if [ ! -e /etc/rpm/macros -a -e /etc/rpmrc -a -f %{__prefix}/lib/rpm/convertrpmrc.sh ]; then
-	sh %{__prefix}/lib/rpm/convertrpmrc.sh > /dev/null 2>&1
-fi
 %endif
-/bin/rpm --initdb
-if [ -f /var/lib/rpm/Packages]; then
+if [ -f /var/lib/rpm/packages.rpm ]; then
+    : # do nothing
+elif [ -f /var/lib/rpm/Packages ]; then
+    # undo db1 configuration
+    rm -f /etc/rpm/macros.db1
+else
+    # initialize db3 database
     rm -f /etc/rpm/macros.db1
+    /bin/rpm --initdb
 fi
 
 %ifos linux
@@ -224,13 +234,6 @@ fi
 %{__prefix}/lib/rpm/armv[34][lb]*
 %endif
 
-%dir %{__prefix}/src/redhat
-%dir %{__prefix}/src/redhat/BUILD
-%dir %{__prefix}/src/redhat/SPECS
-%dir %{__prefix}/src/redhat/SOURCES
-%dir %{__prefix}/src/redhat/SRPMS
-%dir %{__prefix}/src/redhat/RPMS
-%{__prefix}/src/redhat/RPMS/*
 %{__prefix}/*/locale/*/LC_MESSAGES/rpm.mo
 %{__prefix}%{__share}/man/man[18]/*.[18]*
 %lang(pl) %{__prefix}%{__share}/man/pl/man[18]/*.[18]*
@@ -239,6 +242,13 @@ fi
 
 %files build
 %defattr(-,root,root)
+%dir %{__prefix}/src/redhat
+%dir %{__prefix}/src/redhat/BUILD
+%dir %{__prefix}/src/redhat/SPECS
+%dir %{__prefix}/src/redhat/SOURCES
+%dir %{__prefix}/src/redhat/SRPMS
+%dir %{__prefix}/src/redhat/RPMS
+%{__prefix}/src/redhat/RPMS/*
 %{__prefix}/bin/rpmbuild
 %{__prefix}/lib/rpm/brp-*
 %{__prefix}/lib/rpm/check-prereqs
@@ -300,7 +310,20 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
-* Sun Dec  3 2000 Jeff Johnson <jbj@redhat.com>
+* Tue Dec 12 2000 Jeff Johnson <jbj@redhat.com>
+- bail on header regions.
+
+* Sun Dec 10 2000 Jeff Johnson <jbj@redhat.com>
+- handle added dirtoken tags (mostly) correctly with header regions.
+- add FHS doc/man/info dirs, diddle autoconf goo.
+- fix: headerUnload handles headers w/o regions correctly on rebuilddb.
+
+* Thu Dec  7 2000 Jeff Johnson <jbj@redhat.com>
+- add rpmtransGetKeys() to retrieve transaction keys in tsort'ed order.
+- python bindings for rpmtransGetKeys().
+- fix: include alignment in count when swabbing header region.
+
+* Wed Dec  6 2000 Jeff Johnson <jbj@redhat.com>
 - improved find-{requires,provides} for aix4/hpux/irix6/osf.
 		Tim Mooney<mooney@dogbert.cc.ndsu.NoDak.edu>
 - portability: remove use of GNU make subst in lib/Makefile (Joe Orton).
@@ -311,6 +334,10 @@ fi
 - unify rpmError and rpmMessge interfaces through rpmlog.
 - collect and display rpm build error messages at end of build.
 - use package version 3 if --nodirtokens is specified.
+- add package names to problem sets early, don't save removed header.
+- make sure that replaced tags in region are counted in headerSizeof().
+- support for dmalloc debugging.
+- filter region tags in headerNextIterator, exit throut headerReload.
 
 * Thu Nov 30 2000 Jeff Johnson <jbj@redhat.com>
 - add missing headerFree for legacy signature header.
diff --git a/rpm2cpio.c b/rpm2cpio.c
index a7cf1753e..cc7c2dc23 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -3,6 +3,7 @@
 #include "system.h"
 
 #include "rpmlib.h"
+#include "debug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/rpmio/base64.c b/rpmio/base64.c
index 159d6e371..80ecee930 100644
--- a/rpmio/base64.c
+++ b/rpmio/base64.c
@@ -1,13 +1,12 @@
 /** \ingroup signature
  * \file rpmio/base64.c
- *
  */
 
 static int _debug = 0;
 
 #include "system.h"
-
 #include "base64.h"
+#include "debug.h"
 
 int B64decode (const char * s, void ** datap, size_t *lenp)
 {
diff --git a/rpmio/digest.c b/rpmio/digest.c
index c3caece4a..434ce6acf 100644
--- a/rpmio/digest.c
+++ b/rpmio/digest.c
@@ -1,11 +1,10 @@
 /** \ingroup signature
  * \file rpmio/digest.c
- *
  */
 
 #include "system.h"
-
 #include "rpmio_internal.h"
+#include "debug.h"
 
 typedef unsigned int uint32;
 typedef unsigned char byte;
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 40aa7f067..f7301a4a1 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1,13 +1,10 @@
-#include "system.h"
-
 /** \ingroup rpmrc rpmio
  * \file rpmio/macro.c
- *
  */
 
 static int _debug = 0;
 
-#include <assert.h>
+#include "system.h"
 #include <stdarg.h>
 
 #if !defined(isblank)
@@ -32,7 +29,6 @@ static int _debug = 0;
 #define	_(x)	x
 
 #define	vmefail()		(exit(1), NULL)
-#define	xfree(_p)		free((void *)_p)
 #define	urlPath(_xr, _r)	*(_r) = (_xr)
 
 typedef	FILE * FD_t;
@@ -54,6 +50,8 @@ typedef	FILE * FD_t;
 
 #include <rpmmacro.h>
 
+#include "debug.h"
+
 /*@access FD_t@*/		/* XXX compared with NULL */
 /*@access MacroContext@*/
 /*@access MacroEntry@*/
@@ -1573,7 +1571,7 @@ rpmExpandNumeric(const char *arg)
 	if (!(end && *end == '\0'))
 	    rc = 0;
     }
-    xfree(val);
+    free((void *)val);
 
     return rc;
 }
@@ -1736,9 +1734,9 @@ fprintf(stderr, "*** RGP ut %d file %s nurl %d\n", ut, file, nurl);
 
     result = rpmGetPath(url, root, "/", mdir, "/", file, NULL);
 
-    xfree(xroot);
-    xfree(xmdir);
-    xfree(xfile);
+    free((void *)xroot);
+    free((void *)xmdir);
+    free((void *)xfile);
 if (_debug)
 fprintf(stderr, "*** RGP result %s\n", result);
     return result;
@@ -1783,7 +1781,7 @@ main(int argc, char *argv[])
 	    val = rpmGetPath(argv[optind], NULL);
 	    if (val) {
 		fprintf(stdout, "%s:\t%s\n", argv[optind], val);
-		xfree(val);
+		free((void *)val);
 	    }
 	}
 	rpmFreeMacros(NULL);
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index dc83da849..d3603e70e 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -1,16 +1,11 @@
-#include "system.h"
-
 /** \ingroup rpmio
  * \file rpmio/rpmio.c
  */
 
+#include "system.h"
 #include <stdarg.h>
 
 #ifdef	__LCLINT__
-#define	ntohl(_x)	(_x)
-#define	ntohs(_x)	(_x)
-#define	htonl(_x)	(_x)
-#define	htons(_x)	(_x)
 typedef	unsigned int		uint32_t;
 #define	INADDR_ANY		((uint32_t) 0x00000000)
 #define	IPPROTO_IP		0
@@ -46,7 +41,6 @@ extern int h_errno;
 #define	IPPORT_HTTP	80
 #endif
 
-
 #if !defined(HAVE_INET_ATON)
 static int inet_aton(const char *cp, struct in_addr *inp)
 {
@@ -69,6 +63,10 @@ static int inet_aton(const char *cp, struct in_addr *inp)
 #include "ugid.h"
 #include "rpmmessages.h"
 
+#include "debug.h"
+
+/*@access urlinfo@*/
+
 #define FDNREFS(fd)	(fd ? ((FD_t)fd)->nrefs : -9)
 #define FDTO(fd)	(fd ? ((FD_t)fd)->rd_timeoutsecs : -99)
 #define FDCPIOPOS(fd)	(fd ? ((FD_t)fd)->fd_cpioPos : -99)
@@ -81,8 +79,6 @@ static int inet_aton(const char *cp, struct in_addr *inp)
 
 #define	fdGetFILE(_fd)	((FILE *)fdGetFp(_fd))
 
-/*@access urlinfo@*/
-
 #if _USE_LIBIO
 int noLibio = 0;
 #else
diff --git a/rpmio/rpmio_api.c b/rpmio/rpmio_api.c
index a5275f938..af0afd3b9 100644
--- a/rpmio/rpmio_api.c
+++ b/rpmio/rpmio_api.c
@@ -8,6 +8,9 @@
 #define	fdFileno	_fdFileno
 #include <rpmio_internal.h>
 #undef	fdFileno
+
+#include "debug.h"
+
 /*@access FD_t@*/
 
 int fdFileno(void * cookie) {
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index d3ee03a21..775a8d6a8 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -9,7 +9,6 @@ static inline int fdFileno(void * cookie);
 
 #include <rpmio.h>
 #include <rpmurl.h>
-#include <assert.h>
 
 /** \ingroup rpmio
  */
@@ -131,8 +130,6 @@ extern int _rpmio_debug;
 #define DBGIO(_f, _x)   DBG((_f), RPMIO_DEBUG_IO, _x)
 #define DBGREFS(_f, _x) DBG((_f), RPMIO_DEBUG_REFS, _x)
 
-#define xfree(_p)       free((void *)_p)
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c
index 6f8576f19..99dddb338 100644
--- a/rpmio/rpmlog.c
+++ b/rpmio/rpmlog.c
@@ -3,10 +3,9 @@
  */
 
 #include "system.h"
-
 #include <stdarg.h>
-
 #include "rpmlog.h"
+#include "debug.h"
 
 /*@access rpmlogRec @*/
 
diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c
index c99c6e713..7923f87ff 100644
--- a/rpmio/rpmmalloc.c
+++ b/rpmio/rpmmalloc.c
@@ -3,6 +3,7 @@
  */
 
 #include "system.h"
+#include "debug.h"
 
 #if !defined(EXIT_FAILURE)
 #define	EXIT_FAILURE	1
diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index 18b7e10aa..34081f9cc 100644
--- a/rpmio/rpmrpc.c
+++ b/rpmio/rpmrpc.c
@@ -3,10 +3,10 @@
  */
 
 #include "system.h"
-
 #include <rpmio_internal.h>
 #include <popt.h>
 #include "ugid.h"
+#include "debug.h"
 
 /*@access FD_t@*/
 /*@access urlinfo@*/
@@ -230,7 +230,7 @@ int Unlink(const char * path) {
 /* XXX swiped from mc-4.5.39-pre9 vfs/ftpfs.c */
 
 #define	g_strdup	xstrdup
-#define	g_free		xfree
+#define	g_free		free
 
 /*
  * FIXME: this is broken. It depends on mc not crossing border on month!
@@ -958,7 +958,7 @@ static void ftpGlobfree(glob_t * pglob) {
 if (_rpmio_debug)
 fprintf(stderr, "*** ftpGlobfree(%p)\n", pglob);
     if (pglob->gl_offs == -1)	/* XXX HACK HACK HACK */
-	xfree(pglob->gl_pathv);
+	free((void *)pglob->gl_pathv);
 }
 
 int Stat(const char * path, struct stat * st) {
diff --git a/rpmio/tdigest.c b/rpmio/tdigest.c
index b1e7d64d4..96093266b 100644
--- a/rpmio/tdigest.c
+++ b/rpmio/tdigest.c
@@ -1,7 +1,7 @@
 #include "system.h"
-
 #include "rpmio_internal.h"
 #include "popt.h"
+#include "debug.h"
 
 static rpmDigestFlags flags = RPMDIGEST_MD5;
 
@@ -54,7 +54,7 @@ main(int argc, const char *argv[])
 	if (digest) {
 	    fprintf(stdout, "%s  %s\n", digest, fn);
 	    fflush(stdout);
-	    xfree(digest);
+	    free((void *)digest);
 	}
     }
     return rc;
diff --git a/rpmio/tkey.c b/rpmio/tkey.c
index 49b8871a5..f9b553d4c 100644
--- a/rpmio/tkey.c
+++ b/rpmio/tkey.c
@@ -1,13 +1,12 @@
 /** \ingroup signature
  * \file rpmio/base64.c
- *
  */
 
 static int _debug = 0;
 
 #include "system.h"
-
 #include "base64.h"
+#include "debug.h"
 
 typedef unsigned char byte;
 
diff --git a/rpmio/trpmio.c b/rpmio/trpmio.c
index 7dfa68d60..61d8f7e68 100644
--- a/rpmio/trpmio.c
+++ b/rpmio/trpmio.c
@@ -3,8 +3,8 @@
  */
 
 #include <stdio.h>
- 
 #include "rpmio.h"
+#include "debug.h"
 
 int main (void)
 {
diff --git a/rpmio/ugid.c b/rpmio/ugid.c
index c00c136f4..3a529311e 100644
--- a/rpmio/ugid.c
+++ b/rpmio/ugid.c
@@ -3,8 +3,8 @@
  */
 
 #include "system.h"
-
 #include "ugid.h"
+#include "debug.h"
 
 /* unameToUid(), uidTouname() and the group variants are really poorly
    implemented. They really ought to use hash tables. I just made the
diff --git a/rpmio/url.c b/rpmio/url.c
index 91b65a659..1d4d46905 100644
--- a/rpmio/url.c
+++ b/rpmio/url.c
@@ -4,12 +4,7 @@
 
 #include "system.h"
 
-#ifdef	__LCLINT__
-#define	ntohl(_x)	(_x)
-#define	ntohs(_x)	(_x)
-#define	htonl(_x)	(_x)
-#define	htons(_x)	(_x)
-#else
+#if !defined(__LCLINT__)
 #include <netinet/in.h>
 #endif	/* __LCLINT__ */
 
@@ -17,6 +12,10 @@
 #include <rpmmessages.h>
 #include <rpmio_internal.h>
 
+#include "debug.h"
+
+/*@access FD_t@*/		/* XXX compared with NULL */
+/*@access urlinfo@*/
 
 #ifndef	IPPORT_FTP
 #define	IPPORT_FTP	21
@@ -25,9 +24,6 @@
 #define	IPPORT_HTTP	80
 #endif
 
-/*@access FD_t@*/		/* XXX compared with NULL */
-/*@access urlinfo@*/
-
 #define	URL_IOBUF_SIZE	4096
 int url_iobuf_size = URL_IOBUF_SIZE;
 
@@ -119,16 +115,16 @@ URLDBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file,
 	free(u->buf);
 	u->buf = NULL;
     }
-    if (u->url)		xfree(u->url);
-    if (u->service)	xfree(u->service);
-    if (u->user)	xfree(u->user);
-    if (u->password)	xfree(u->password);
-    if (u->host)	xfree(u->host);
-    if (u->portstr)	xfree(u->portstr);
-    if (u->proxyu)	xfree(u->proxyu);
-    if (u->proxyh)	xfree(u->proxyh);
-
-    /*@-refcounttrans@*/ xfree(u); /*@-refcounttrans@*/
+    if (u->url)		free((void *)u->url);
+    if (u->service)	free((void *)u->service);
+    if (u->user)	free((void *)u->user);
+    if (u->password)	free((void *)u->password);
+    if (u->host)	free((void *)u->host);
+    if (u->portstr)	free((void *)u->portstr);
+    if (u->proxyu)	free((void *)u->proxyu);
+    if (u->proxyh)	free((void *)u->proxyh);
+
+    /*@-refcounttrans@*/ free((void *)u); /*@-refcounttrans@*/
     return NULL;
 }
 
@@ -217,7 +213,7 @@ static void urlFind(urlinfo *uret, int mustAsk)
 
     /* Zap proxy host and port in case they have been reset */
     u->proxyp = -1;
-    if (u->proxyh)	xfree(u->proxyh);
+    if (u->proxyh)	free((void *)u->proxyh);
 
     /* Perform one-time FTP initialization */
     if (u->urltype == URL_IS_FTP) {
@@ -226,7 +222,7 @@ static void urlFind(urlinfo *uret, int mustAsk)
 	    char * prompt;
 	    prompt = alloca(strlen(u->host) + strlen(u->user) + 256);
 	    sprintf(prompt, _("Password for %s@%s: "), u->user, u->host);
-	    if (u->password)	xfree(u->password);
+	    if (u->password)	free((void *)u->password);
 	    u->password = /*@-unrecog@*/ getpass(prompt) /*@=unrecog@*/;
 	    u->password = xstrdup(u->password);	/* XXX xstrdup has side effects. */
 	}
@@ -240,7 +236,7 @@ static void urlFind(urlinfo *uret, int mustAsk)
 		u->proxyu = nu;
 		u->proxyh = xstrdup(proxy);
 	    }
-	    xfree(proxy);
+	    free((void *)proxy);
 	}
 
 	if (u->proxyp < 0) {
@@ -255,7 +251,7 @@ static void urlFind(urlinfo *uret, int mustAsk)
 		}
 		u->proxyp = port;
 	    }
-	    xfree(proxy);
+	    free((void *)proxy);
 	}
     }
 
@@ -266,7 +262,7 @@ static void urlFind(urlinfo *uret, int mustAsk)
 	    const char *proxy = rpmExpand("%{_httpproxy}", NULL);
 	    if (proxy && *proxy != '%')
 		u->proxyh = xstrdup(proxy);
-	    xfree(proxy);
+	    free((void *)proxy);
 	}
 
 	if (u->proxyp < 0) {
@@ -281,7 +277,7 @@ static void urlFind(urlinfo *uret, int mustAsk)
 		}
 		u->proxyp = port;
 	    }
-	    xfree(proxy);
+	    free((void *)proxy);
 	}
 
     }
diff --git a/rpmqv.c b/rpmqv.c
index cac1fb479..aef9dbc7b 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -57,6 +57,8 @@ static int noPgp = 0;
 #include "signature.h"
 #endif
 
+#include "debug.h"
+
 #define GETOPT_DBPATH		1010
 #define GETOPT_SHOWRC		1018
 #define	GETOPT_DEFINEMACRO	1020
@@ -774,7 +776,7 @@ int main(int argc, const char ** argv)
     poptResetContext(optCon);
 
 #ifdef	IAM_RPMQV
-    if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
+    if (qva->qva_queryFormat) free((void *)qva->qva_queryFormat);
     memset(qva, 0, sizeof(*qva));
     qva->qva_source = RPMQV_PACKAGE;
     qva->qva_mode = ' ';
@@ -782,7 +784,7 @@ int main(int argc, const char ** argv)
 #endif
 
 #ifdef	IAM_RPMBT
-    if (ba->buildRootOverride) xfree(ba->buildRootOverride);
+    if (ba->buildRootOverride) free((void *)ba->buildRootOverride);
     if (ba->targets) free(ba->targets);
     memset(ba, 0, sizeof(*ba));
     ba->buildMode = ' ';
@@ -921,7 +923,7 @@ int main(int argc, const char ** argv)
 	  case GETOPT_EVALMACRO:
 	  { const char *val = rpmExpand(optArg, NULL);
 	    fprintf(stdout, "%s\n", val);
-	    xfree(val);
+	    free((void *)val);
 	    noUsageMsg = 1;
 	  } break;
 
@@ -1280,7 +1282,7 @@ int main(int argc, const char ** argv)
 	    ec = build(specFile, ba, passPhrase, 0, cookie, rcfile, force, noDeps);
 	    free(cookie);
 	    cookie = NULL;
-	    xfree(specFile);
+	    free((void *)specFile);
 	    specFile = NULL;
 
 	    if (ec)
@@ -1561,11 +1563,11 @@ int main(int argc, const char ** argv)
     urlFreeCache();
 
 #ifdef	IAM_RPMQV
-    if (qva->qva_queryFormat) xfree(qva->qva_queryFormat);
+    if (qva->qva_queryFormat) free((void *)qva->qva_queryFormat);
 #endif
 
 #ifdef	IAM_RPMBT
-    if (ba->buildRootOverride) xfree(ba->buildRootOverride);
+    if (ba->buildRootOverride) free((void *)ba->buildRootOverride);
     if (ba->targets) free(ba->targets);
 #endif
 
diff --git a/rpmrc.in b/rpmrc.in
index 9043502fc..e438d8091 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,4 +1,4 @@
-# $Id: rpmrc.in,v 2.32 2000/12/02 21:53:44 jbj Exp $
+# $Id: rpmrc.in,v 2.33 2000/12/12 20:03:45 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -289,5 +289,5 @@ buildarch_compat: hades: m68kmint noarch
 buildarch_compat: ia64: noarch
 buildarch_compat: s390: noarch
 
-macrofiles:	@RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
+macrofiles:	@RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 5e8f649f9..971de3e79 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -8,8 +8,8 @@ EXTRA_DIST = \
 	brp-sparc64-linux check-prereqs convertrpmrc.sh find-lang.sh \
 	find-prov.pl find-req.pl cpanflute find-provides.perl \
 	find-requires.perl get_magic.pl getpo.sh http.req \
-	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
-	vpkg-provides.sh vpkg-provides2.sh
+	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
+	trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh
 
 installprefix = $(DESTDIR)
 
diff --git a/scripts/rpmdiff b/scripts/rpmdiff
index 6b88f4088..376a69ee6 100644
--- a/scripts/rpmdiff
+++ b/scripts/rpmdiff
@@ -415,7 +415,7 @@ sub set_static_vars {
   
   $NUM_DIFFERENCES = 0;
 
-  $RCS_REVISION = ' $Revision: 1.5 $ ';
+  $RCS_REVISION = ' $Revision: 1.6 $ ';
   
   # set a known path.
  
diff --git a/scripts/trpm b/scripts/trpm
new file mode 100755
index 000000000..71863c452
--- /dev/null
+++ b/scripts/trpm
@@ -0,0 +1,189 @@
+#!/bin/sh
+
+dbg=	# echo
+
+dist=7.0
+type=all
+arch=`/bin/rpm --eval '%{_arch}'`
+
+root=`pwd`/root
+sudo=sudo
+rpm="/X/src/rpm401/rpm --root $root"
+rpmb=/usr/bin/rpmbuild
+rpmdb=/usr/bin/rpmdb
+justdb="--justdb --noscripts --notriggers --ignoresize"
+dmopts="-l dmalloc.log -i 100 low"
+db1=
+sorted=	# "| sort"
+
+minglob="
+basesystem-
+bash-[12]
+filesystem-
+glibc-2
+ldconfig-
+libtermcap-2
+mktemp-
+setup-
+termcap-
+"
+
+min1glob="
+$minglob
+bzip2-[01]
+chkconfig-
+db1-1
+db2-2
+db3-3
+dev-
+diffutils-
+e2fsprogs-1
+fileutils-
+findutils-
+gawk-
+gdb-
+gdbm-1
+grep-
+gzip-
+info-
+mount-
+ncurses-[45]
+procps-2
+psmisc-
+sed-
+shadow-utils-
+rmt-
+tar-
+textutils-
+vim-common-
+vim-minimal-
+zlib-1
+"
+
+min2glob="
+$min1glob
+cpio-
+cracklib-
+glib-1
+logrotate-
+mingetty-
+popt-
+pwdb-
+slang-[01]
+which-
+words-
+"
+
+baseglob="
+$min2glob
+console-tools-
+initscripts-
+kernel-2
+modutils-
+pam-0
+pamconfig-
+sh-utils-
+sysklogd-
+util-linux-
+vixie-cron-
+rpm-[34]
+rpm-devel-[34]
+"
+
+develglob="
+$baseglob
+bzip2-devel-
+db1-devel-
+db2-devel-
+db3-devel-
+gdbm-devel-
+glibc-devel-
+kernel-headers-
+ncurses-devel-
+tcl-
+zlib-devel-
+"
+
+buildglob="
+$develglob
+autoconf-
+automake-
+binutils-
+cpp-
+cvs-
+db3-utils-
+egcs-2
+gcc-2
+gettext-
+krb5-libs-
+libstdc++-
+libtool-
+make-
+m4-
+perl-
+tcsh-
+"
+
+notallpat="(kernel-[^2h])"
+
+for cmd in $*
+do
+    echo "=======> start $cmd	`date`"
+    case $cmd in
+    debug)		dbg=echo	;;
+    dmalloc)		eval `dmalloc -b $dmopts`	;;
+    db1)		db1="--define '%_dbapi 1'"	;;
+    5.2|6.2|7.0|7.1)	dist=$cmd	;;
+    manifest)
+	rm -f *-$dist-$arch
+	pkgs="/$dist/$arch"
+ 	ls -1 ${pkgs}/*.rpm | egrep "(noarch|$arch).rpm" > list-$dist-$arch
+	cat list-$dist-$arch | egrep -v $notallpat > all-$dist-$arch
+	for l in min min1 min2 base devel build
+	do
+	    glv='$'${l}glob
+	    glist="`eval echo $glv`"
+	    for g in $glist ; do
+		ls -1 ${pkgs}/${g}*.rpm 2> /dev/null
+	    done | egrep "(noarch|$arch).rpm" $sorted > $l-$dist-$arch
+	done
+	;;
+    --initdb)
+	[ -d $root ] && \
+		$dbg $sudo mv $root ${root}-$$ && \
+		$dbg $sudo rm -rf ${root}-$$ &
+	sleep 2
+	$dbg $sudo mkdir -p $root/var/lib/rpm
+	$dbg $sudo $rpm $db1 --initdb
+	;;
+    --savedb)
+	( $dbg cd $root/var/lib && $dbg $sudo tar czvf rpmdb.tar.gz rpm ; )
+	;;
+    --rebuilddb)
+	$dbg $sudo $rpm --rebuilddb -vv
+	;;
+    --justdb)
+	[ -f $type-$dist-$arch ] || {
+	    echo $type-$dist-$arch not found
+	    exit 1
+	}
+	$dbg $sudo $rpm $db1 -Uv $justdb `cat $type-$dist-$arch`
+	;;
+    -U*|-F*)
+	[ -f $type-$dist-$arch ] || {
+	    echo $type-$dist-$arch not found
+	    exit 1
+	}
+	$dbg $sudo $rpm $db1 $cmd `cat $type-$dist-$arch`
+	;;
+    -[Vqei]*)
+	$dbg $sudo $rpm $cmd
+	;;
+    chroot)
+	$dbg $sudo cp /etc/resolv.conf $root/etc
+	$dbg $sudo env HOME=/root chroot $root
+	;;
+    *)		type=$cmd	;;
+    esac
+done
+echo "=======> finish	`date`"
diff --git a/system.h b/system.h
index 5cdbd9e00..3e94ef00b 100644
--- a/system.h
+++ b/system.h
@@ -1,19 +1,6 @@
-/* system-dependent definitions for fileutils programs.
-   Copyright (C) 89, 91, 92, 93, 94, 1996 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/**
+ * \file system.h
+ */
 
 #ifndef	H_SYSTEM
 #define	H_SYSTEM
diff --git a/tools/dump.c b/tools/dump.c
index d3e866b35..6d05af679 100644
--- a/tools/dump.c
+++ b/tools/dump.c
@@ -1,6 +1,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include "debug.h"
 
 int main(int argc, char ** argv)
 {
diff --git a/tools/dumpdb.c b/tools/dumpdb.c
index 55c843eda..0fc2ef781 100644
--- a/tools/dumpdb.c
+++ b/tools/dumpdb.c
@@ -1,6 +1,7 @@
 #include "system.h"
 
 #include "rpmlib.h"
+#include "debug.h"
 
 int main(int argc, char ** argv)
 {
diff --git a/tools/javadeps.c b/tools/javadeps.c
index 64a6c9ce2..ab3deaebc 100644
--- a/tools/javadeps.c
+++ b/tools/javadeps.c
@@ -64,6 +64,7 @@ marc@redhat.com and ewt@redhat.com.
 */
 
 #include <stdarg.h>
+#include "debug.h"
 
 /*---------typedefs---------*/
 
@@ -230,7 +231,7 @@ usage (void)
 	 "                  output of --provides.\n\n"
 	 "'RPM_Requires: '  This string lists additional requirements of\n"
 	 "                  the java class.  The string should be a white \n"
-	 "                  space ([\\t   \v\\n\\r\\f\\ ]) separated list of \n"
+	 "                  space ([\\t\v\\n\\r\\f\\ ]) separated list of \n"
 	 "                  dependency strings.  Each dependency string must\n"
 	 "                  be of the same format as would be valid in the \n"
 	 "                  Requires or Provides line of the specfile.  This\n"
@@ -243,7 +244,7 @@ usage (void)
 	 "assumed to be zero. \n\n"
 	 "");
   printf("EXAMPLES (Java Keywords): \n\n"
-	 "\t public static final String REVISION = \"$Revision: 2.7 $\";\n"
+	 "\t public static final String REVISION = \"$Revision: 2.8 $\";\n"
 	 "\t public static final String EPOCH = \"4\";\n"
 	 "\t public static final String REQUIRES = \"RPM_Requires: "
 	 "java(gnu.regexp.RE) java(com.ibm.site.util.Options)>=1.5\";\n"
diff --git a/tools/rpmarchive.c b/tools/rpmarchive.c
index e599b488f..c9c49acdb 100644
--- a/tools/rpmarchive.c
+++ b/tools/rpmarchive.c
@@ -2,9 +2,11 @@
 
 #include "system.h"
 
+#include "header.h"
 #include "rpmlead.h"
 #include "signature.h"
-#include "header.h"
+
+#include "debug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tools/rpmchecksig.c b/tools/rpmchecksig.c
index f575e6ac3..b119dabed 100644
--- a/tools/rpmchecksig.c
+++ b/tools/rpmchecksig.c
@@ -6,6 +6,7 @@
 
 #include "rpmlead.h"
 #include "signature.h"
+#include "debug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tools/rpmheader.c b/tools/rpmheader.c
index 39bf01a29..d48e85bfc 100644
--- a/tools/rpmheader.c
+++ b/tools/rpmheader.c
@@ -2,9 +2,10 @@
 
 #include "system.h"
 
+#include "header.h"
 #include "rpmlead.h"
 #include "signature.h"
-#include "header.h"
+#include "debug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tools/rpminject.c b/tools/rpminject.c
index 935bfbb7c..5a2b391d7 100644
--- a/tools/rpminject.c
+++ b/tools/rpminject.c
@@ -3,11 +3,12 @@
 #include "rpmbuild.h"
 #include "buildio.h"
 
+#include "header.h"
 #include "rpmlead.h"
 #include "signature.h"
-#include "header.h"
 
 #include <err.h>	/* XXX !HAVE_ERR_H: get from misc */
+#include "debug.h"
 
 typedef enum injmode_e { INJ_UNKNOWN, INJ_ADD, INJ_DELETE, INJ_MODIFY } injmode_t;
 
diff --git a/tools/rpmlead.c b/tools/rpmlead.c
index 4770ea182..4f7994aad 100644
--- a/tools/rpmlead.c
+++ b/tools/rpmlead.c
@@ -4,6 +4,7 @@
 
 #include "rpmio.h"
 #include "rpmlead.h"
+#include "debug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tools/rpmsignature.c b/tools/rpmsignature.c
index 0723dff4c..71d553d14 100644
--- a/tools/rpmsignature.c
+++ b/tools/rpmsignature.c
@@ -4,6 +4,7 @@
 
 #include "rpmlead.h"
 #include "signature.h"
+#include "debug.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index f45c25c24..f273e040a 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -5,6 +5,7 @@
 
 #include "depends.h"
 #include "header.h"
+#include "debug.h"
 
 extern int _depends_debug;